Ticket #6656: 6656.patch

_source/plugins/panelbutton/plugin.js

@@ -93 +93 @@
                                         return;
 
                                 var panelDefinition = this._.panelDefinition || {},
-                                         panelBlockDefinition = this._.panelDefinition.block,
+                                        panelBlockDefinition = this._.panelDefinition.block,
                                         panelParentElement = panelDefinition.parent || CKEDITOR.document.getBody(),
                                         panel = this._.panel = new CKEDITOR.ui.floatPanel( editor, panelParentElement, panelDefinition ),
                                         block = panel.addBlock( _.id, panelBlockDefinition ),
@@ -104 +104 @@
                                                 if ( me.className )
                                                         this.element.getFirst().addClass( me.className + '_panel' );
 
-                                                _.oldState = me._.state;
                                                 me.setState( CKEDITOR.TRISTATE_ON );
 
                                                 _.on = 1;
@@ -118 +117 @@
                                                 if ( me.className )
                                                         this.element.getFirst().removeClass( me.className + '_panel' );
 
-                                                me.setState( _.oldState );
+                                                me.setState( me.modes && me.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
 
                                                 _.on = 0;
 
@@ -136 +135 @@
                                         this.onBlock( panel, block );
 
                                 block.onHide = function()
-                                                {
-                                                                _.on = 0;
-                                                                me.setState( CKEDITOR.TRISTATE_OFF );
-                                                };
+                                        {
+                                                _.on = 0;
+                                                me.setState( CKEDITOR.TRISTATE_OFF );
+                                        };
                         }
                 }
         });