Ticket #7280: 7280_4.patch

_source/plugins/panelbutton/plugin.js

@@ -32 +32 @@
 
                         $ : function( definition )
                         {
+                                // Store/Restore a copy of the panel definition to allow switch toolbars
+                                if ( definition.panel )
+                                        definition.storedPanel = definition.panel;
+                                else
+                                        definition.panel = definition.storedPanel;
+
                                 // We don't want the panel definition in this object.
                                 var panelDefinition = definition.panel;
                                 delete definition.panel;

_source/plugins/richcombo/plugin.js

@@ -128 +128 @@
                                 clickFn : clickFn
                         };
 
-                        function updateState()
+                        instance.updateState = function()
                         {
                                 var state = this.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED;
                                 this.setState( editor.readOnly && !this.readOnly ? CKEDITOR.TRISTATE_DISABLED : state );
                                 this.setValue( '' );
                         }
 
-                        editor.on( 'mode', updateState, this );
+                        editor.on( 'mode', instance.updateState, this );
                         // If this combo is sensitive to readOnly state, update it accordingly.
-                        !this.readOnly && editor.on( 'readOnly', updateState, this);
+                        !this.readOnly && editor.on( 'readOnly', instance.updateState, this);
 
                         var keyDownFn = CKEDITOR.tools.addFunction( function( ev, element )
                                 {

_source/plugins/toolbar/plugin.js

@@ -168 +168 @@
                                 {
                                         if ( event.data.space == editor.config.toolbarLocation )
                                         {
+                                                event.data.html += generateToolbarHtml( editor );
+                                        }
+                                });
+
+                        var generateToolbarHtml = function ( editor )
+                        {
                                                 editor.toolbox = new toolbox();
 
                                                 var labelId = CKEDITOR.tools.getNextId();
@@ -376 +382 @@
                                                                                 '</a>' );
                                                 }
 
-                                                event.data.html += output.join( '' );
-                                        }
-                                });
+                                return output.join( '' );
+                        };
 
-                        editor.on( 'destroy', function()
+                        var destroyToolbar = function()
                         {
                                 var toolbars, index = 0, i,
                                                 items, instance;
@@ -393 +398 @@
                                                 instance = items[ i ];
                                                 if ( instance.clickFn ) CKEDITOR.tools.removeFunction( instance.clickFn );
                                                 if ( instance.keyDownFn ) CKEDITOR.tools.removeFunction( instance.keyDownFn );
+
+                                                if ( instance.button && instance.button.command )
+                                                {
+                                                        var command = editor.getCommand( instance.button.command );
+                                                        command.uiItems = [];
+                                                }
+
+                                                if ( instance.updateState )
+                                                {
+                                                        this.removeListener( 'mode', instance.updateState );
+                                                        this.removeListener( 'readOnly', instance.updateState );
+                                                }
                                         }
                                 }
-                        });
+                        };
 
+                        editor.on( 'destroy', destroyToolbar );
+
+                        // Method to switch the currently used toolbar
+                        editor.setToolbar = function( toolbar )
+                        {
+                                // Remove existing toolbar
+                                destroyToolbar.call( this );
+
+                                // Set new one
+                                this.config.toolbar = toolbar;
+
+                                // Create it
+                                var toolbarLocation = this.config.toolbarLocation,
+                                        space = document.getElementById( 'cke_' + toolbarLocation + '_' + this.name );
+
+                                space.innerHTML = generateToolbarHtml( this );
+
+                                // IE...
+                                if ( CKEDITOR.env.ie )
+                                {
+                                        var table = space.parentNode.parentNode.parentNode;
+                                        table.style.display = 'none';
+                                        // Force refresh
+                                        var h = table.scrollHeight;
+                                        table.style.display = '';
+                                }
+                        };
+
                         editor.addCommand( 'toolbarFocus', commands.toolbarFocus );
 
                         editor.ui.add( '-', CKEDITOR.UI_SEPARATOR, {} );