Ticket #4252: 4252.patch

_source/core/ui.js

@@ -75 +75 @@
                 if ( command )
                         command.uiItems.push( result );
 
+                // Replace the registered items with created instances.
+                this._.items[ name ] = result;
+
                 return result;
         },
 

_source/plugins/richcombo/plugin.js

@@ -273 +273 @@
                                         me.setState( CKEDITOR.TRISTATE_OFF );
                                 };
 
+                        panel.on( 'showBlock', function()
+                        {
+                                this.fire( 'open', panel );
+                        }, this );
+
                         if ( this.init )
                                 this.init();
                 },
@@ -351 +356 @@
         }
 });
 
+CKEDITOR.event.implementOn( CKEDITOR.ui.richCombo.prototype, true );
 CKEDITOR.ui.prototype.addRichCombo = function( name, definition )
 {
         this.add( name, CKEDITOR.UI_RICHCOMBO, definition );

_source/plugins/menu/plugin.js

@@ -151 +151 @@
                                         },
                                         this );
 
+                                        panel.on( 'showBlock', function()
+                                        {
+                                                this.fire( 'open', panel );
+                                        }, this );
+
+
                                         // Create an autosize block inside the panel.
                                         var block = panel.addBlock( this.id );
                                         block.autoSize = true;
@@ -241 +247 @@
                 }
         });
 
+        CKEDITOR.event.implementOn( CKEDITOR.menu.prototype, true );
+
         function sortItems( items )
         {
                 items.sort( function( itemA, itemB )

_source/plugins/floatpanel/plugin.js

@@ -217 +217 @@
                                                         if ( panel.isLoaded )
                                                                 setHeight();
                                                         else
-                                                                panel.onLoad = setHeight;
+                                                                panel.on( 'load', setHeight );
                                                 }
                                                 else
-                                                        element.getFirst().removeStyle( 'height' );
+                                                        element.getFirst().removeStyle('height');
 
+                                                panel.isLoaded ?
+                                                        this.fire( 'showBlock', block )
+                                                        : panel.on( 'load', function( evt )
+                                                          {
+                                                                  evt.removeListener();
+                                                                  this.fire( 'showBlock', block );
+                                                          }, this );
+
                                                 // Set the IFrame focus, so the blur event gets fired.
                                                 CKEDITOR.tools.setTimeout( function()
                                                         {
@@ -322 +330 @@
                         }
                 }
         });
+
+        CKEDITOR.event.implementOn( CKEDITOR.ui.floatPanel.prototype, true );
+
 })();

_source/plugins/dialog/plugin.js

@@ -2680 +2680 @@
                                 var storedDialogs = this._.storedDialogs ||
                                         ( this._.storedDialogs = {} );
 
-                                var dialog = storedDialogs[ dialogName ] ||
-                                        ( storedDialogs[ dialogName ] = new CKEDITOR.dialog( this, dialogName ) );
-
+                                var dialog = storedDialogs[ dialogName ];
+                                if( !dialog )
+                                {
+                                        dialog = ( storedDialogs[ dialogName ] = new CKEDITOR.dialog( this, dialogName ) );
+                                        dialog.on( 'show', function()
+                                        {
+                                                this.fire( 'dialogOpen', dialog );
+                                        }, this );
+                                }
                                 dialog.show();
 
                                 return dialog;

_source/plugins/toolbar/plugin.js

@@ -193 +193 @@
                                                                         }
 
                                                                         var itemObj = item.render( editor, output );
+                                                                        item.toolbarItem = itemObj;
                                                                         index = toolbarObj.items.push( itemObj ) - 1;
 
                                                                         if ( index > 0 )

_source/plugins/panelbutton/plugin.js

@@ -133 +133 @@
                                                                 _.on = 0;
                                                                 me.setState( CKEDITOR.TRISTATE_OFF );
                                                 };
+                                panel.on( 'showBlock', function()
+                                {
+                                        this.fire( 'open', panel );
+                                }, this );
                         }
                 }
         });
 
+        CKEDITOR.event.implementOn( CKEDITOR.ui.panelButton.prototype, true );
+
 })();

_source/core/test.js

@@ -11 +11 @@
 
 CKEDITOR.test =
 {
+        toolbar :
+        {
+                /**
+                 * Click on a specific toolbar button and the {@param callback} will be
+                 * fed with the consequential UI object which has been opened by this click.
+                 *
+                 * @param itemName The toolbar item definition name.
+                 * @callback The callback function which is called after the affiliate
+                 * button behavior has completed.
+                 * @example
+                 *
+                 * // Click on 'Format' combo.
+                 * CKEDITOR.test.toolbar.clickButton( 'Format' ,
+                 * function( combo )
+                 * {
+                 *      alert( combo instanceof CKEDITOR.ui.richCombo );        // true
+                 * });
+                 *
+                 * // Click on 'Image' dialog.
+                 * CKEDITOR.test.toolbar.clickButton( 'Image' ,
+                 * function( dialog )
+                 * {
+                 *      alert( dialog instanceof CKEDITOR.dialog );     // true
+                 * });
+                 */
+                clickButton : function( editor, itemName, callback, context )
+                {
+                        var ui = editor.ui,
+                                // Find the corresponding ui instances of the toolbar item.
+                                uiItems = ui._.items,
+                                uiItem =uiItems[ itemName ],
+                                // Back reference the toolbar item instance.
+                                toolbarItem = uiItem.toolbarItem,
+                                // Find the command instance registered on this ui item.  
+                                command = editor.getCommand( uiItem.command );
+
+                        // Special treatments for different types of button.
+                        if( uiItem instanceof CKEDITOR.ui.button )
+                        {
+                                // button of style command.
+                                if( command && command.style )
+                                {
+                                        editor.on( 'selectionChange', function( evt )
+                                        {
+                                                evt.removeListener();
+                                                callback.call( context );
+                                        }, null, null, 1000 );
+                                }
+                                // button of dialog command.
+                                if( command && command.dialogName )
+                                {
+                                        editor.on( 'dialogOpen', function( evt )
+                                        {
+                                                evt.removeListener();
+                                                callback.call( context, evt.data );
+                                        }, null, null, 1000 );
+                                }
+                                // button of panel.
+                                else if( uiItem instanceof CKEDITOR.ui.panelButton )
+                                {
+                                        uiItem.on( 'open', function( evt )
+                                        {
+                                                evt.removeListener();
+                                                callback.call( context, uiItem );
+                                        }, null, 1000 );
+                                }
+
+                                // Trigger button.
+                                toolbarItem.execute();
+                        }
+                        else if( uiItem instanceof CKEDITOR.ui.richCombo )
+                        {
+                                uiItem.on( 'open', function( evt )
+                                {
+                                        evt.removeListener();
+                                        callback.call( context, uiItem );
+                                }, null, 1000 );
+
+                                // Trigger combo.
+                                var comboEntry = YAHOO.util.Selector.query( 'a', toolbarItem.id, true );
+                                comboEntry.onclick();
+                        }                       
+                }
+
+        }
 };
 YAHOO.lang.augmentObject( CKEDITOR.test, CKTESTER.tools );

_source/plugins/panel/plugin.js

@@ -141 +141 @@
                                 if ( CKEDITOR.env.isCustomDomain() )
                                         doc.$.domain = document.domain;
 
-                                var onLoad = CKEDITOR.tools.addFunction( CKEDITOR.tools.bind( function( ev )
+                                var onLoad = CKEDITOR.tools.addFunction( CKEDITOR.tools.bind( function()
                                         {
                                                 this.isLoaded = true;
-                                                if ( this.onLoad )
-                                                        this.onLoad();
+                                                this.fire( 'load', this ); 
+
                                         }, this ) );
 
                                 doc.$.write(
@@ -233 +233 @@
         }
 };
 
+CKEDITOR.event.implementOn( CKEDITOR.ui.panel.prototype, true );
 CKEDITOR.ui.panel.block = CKEDITOR.tools.createClass(
 {
         $ : function( blockHolder )