Changeset 5378

Timestamp:

04/14/10 18:23:12 (3 years ago)

Author:

m.nguyen

Message:

#635: Resolve feature open properties dialog when double clicking on objects.

Location:

CKEditor/branches/versions/3.3.x

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/flash/plugin.js (modified) (1 diff)
• _source/plugins/forms/plugin.js (modified) (1 diff)
• _source/plugins/image/plugin.js (modified) (1 diff)
• _source/plugins/link/plugin.js (modified) (1 diff)
• _source/plugins/table/plugin.js (modified) (1 diff)
• _source/plugins/wysiwygarea/plugin.js (modified) (1 diff)

CKEditor/branches/versions/3.3.x/CHANGES.html

@@ -41 +41 @@
         <ul>
                 <li><a href="http://dev.fckeditor.net/ticket/4968">#4968</a> : Config entry 'contentsLangDirection' now has a default value 'ui' which inherit language direction from editor's (UI) language.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/635">#635</a> : Open properties dialog when double clicking on objects.</li>
         </ul>
         <p>

CKEditor/branches/versions/3.3.x/_source/plugins/flash/plugin.js

@@ -77 +77 @@
                                         });
                         }
-
+                        
+                        editor.on( 'doubleclick', function( evt )
+                                {
+                                        var element = evt.data.element;;
+                                        
+                                        if ( element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'flash' ) 
+                                                evt.data.dialog = 'flash';
+                                });
+                                
                         // If the "contextmenu" plugin is loaded, register the listeners.
                         if ( editor.contextMenu )

CKEditor/branches/versions/3.3.x/_source/plugins/forms/plugin.js

@@ -173 +173 @@
                                 });
                 }
+
+                editor.on( 'doubleclick', function( evt )
+                        {
+                                var element = evt.data.element;
+                                
+                                if ( element.is( 'form' ) )
+                                        evt.data.dialog = 'form';
+                                else if ( element.is( 'select' ) ) 
+                                        evt.data.dialog = 'select';     
+                                else if ( element.is( 'textarea' ) ) 
+                                        evt.data.dialog = 'textarea';
+                                else if ( element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'hiddenfield' )
+                                        evt.data.dialog = 'hiddenfield';
+                                else if ( element.is( 'input' ) )
+                                {
+                                        var type = element.getAttribute( 'type' );
+                                        
+                                        switch ( type )
+                                        {
+                                                case 'text' : case 'password':
+                                                        evt.data.dialog = 'textfield';
+                                                        break;
+                                                case 'button' : case 'submit' : case 'reset' :
+                                                        evt.data.dialog = 'button';
+                                                        break;
+                                                case 'checkbox' :
+                                                        evt.data.dialog = 'checkbox';
+                                                        break;
+                                                case 'radio' :
+                                                        evt.data.dialog = 'radio';
+                                                        break;
+                                                case 'image' :
+                                                        evt.data.dialog = 'imagebutton';
+                                                        break;
+                                        }
+                                }
+                        });
         },
 

CKEditor/branches/versions/3.3.x/_source/plugins/image/plugin.js

@@ -26 +26 @@
                                 command : pluginName
                         });
-
+                
+                editor.on( 'doubleclick', function( evt )
+                        {
+                                var element = evt.data.element;
+                                
+                                if ( element.is( 'img' ) && !element.getAttribute( '_cke_realelement' ) )
+                                        evt.data.dialog = 'image';
+                        });
+                        
                 // If the "menu" plugin is loaded, register the menu items.
                 if ( editor.addMenuItems )

CKEditor/branches/versions/3.3.x/_source/plugins/link/plugin.js

@@ -65 +65 @@
                                         command.setState( CKEDITOR.TRISTATE_DISABLED );
                         } );
-
+                
+                editor.on( 'doubleclick', function( evt )
+                        {
+                                var element = CKEDITOR.plugins.link.getSelectedLink( editor ) || evt.data.element;
+                                
+                                if ( element.is( 'a' ) )
+                                        evt.data.dialog =  ( element.getAttribute( 'name' ) && !element.getAttribute( 'href' ) ) ? 'anchor' : 'link';
+                                else if ( element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'anchor' ) 
+                                        evt.data.dialog = 'anchor';
+                        });
+                        
                 // If the "menu" plugin is loaded, register the menu items.
                 if ( editor.addMenuItems )

CKEditor/branches/versions/3.3.x/_source/plugins/table/plugin.js

@@ -45 +45 @@
                                 } );
                 }
-
+                
+                editor.on( 'doubleclick', function( evt )
+                        {
+                                var element = evt.data.element;
+                                
+                                if ( element.is( 'table' ) )
+                                        evt.data.dialog = 'table';
+                        });
+                        
                 // If the "contextmenu" plugin is loaded, register the listeners.
                 if ( editor.contextMenu )

CKEditor/branches/versions/3.3.x/_source/plugins/wysiwygarea/plugin.js

@@ -385 +385 @@
                                                 domDocument     = editor.document       = new CKEDITOR.dom.document( domDocument );
 
+                                                domDocument.on( 'dblclick', function( evt )
+                                                {
+                                                        var element = evt.data.getTarget(),
+                                                                data = { element : element, dialog : '' };
+                                                        editor.fire( 'doubleclick', data );
+                                                        data.dialog && editor.openDialog( data.dialog );
+                                                });
+                                                
                                                 // Gecko/Webkit need some help when selecting control type elements. (#3448)
                                                 if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera) )