vanilla ckeditor-3.4.3

[ckeditor.git] / _source / plugins / panelbutton / plugin.js

diff --git a/_source/plugins/panelbutton/plugin.js b/_source/plugins/panelbutton/plugin.js
index 5821c88..1bddb4b 100644 (file)
--- a/_source/plugins/panelbutton/plugin.js
+++ b/_source/plugins/panelbutton/plugin.js
@@ -93,7 +93,7 @@ CKEDITOR.UI_PANELBUTTON = 4;
                                        return;\r
 \r
                                var panelDefinition = this._.panelDefinition || {},\r
-                                        panelBlockDefinition = this._.panelDefinition.block,\r
+                                       panelBlockDefinition = this._.panelDefinition.block,\r
                                        panelParentElement = panelDefinition.parent || CKEDITOR.document.getBody(),\r
                                        panel = this._.panel = new CKEDITOR.ui.floatPanel( editor, panelParentElement, panelDefinition ),\r
                                        block = panel.addBlock( _.id, panelBlockDefinition ),\r
@@ -104,7 +104,6 @@ CKEDITOR.UI_PANELBUTTON = 4;
                                                if ( me.className )\r
                                                        this.element.getFirst().addClass( me.className + '_panel' );\r
 \r
-                                               _.oldState = me._.state;\r
                                                me.setState( CKEDITOR.TRISTATE_ON );\r
 \r
                                                _.on = 1;\r
@@ -118,7 +117,7 @@ CKEDITOR.UI_PANELBUTTON = 4;
                                                if ( me.className )\r
                                                        this.element.getFirst().removeClass( me.className + '_panel' );\r
 \r
-                                               me.setState( _.oldState );\r
+                                               me.setState( me.modes && me.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );\r
 \r
                                                _.on = 0;\r
 \r
@@ -136,10 +135,10 @@ CKEDITOR.UI_PANELBUTTON = 4;
                                        this.onBlock( panel, block );\r
 \r
                                block.onHide = function()\r
-                                               {\r
-                                                               _.on = 0;\r
-                                                               me.setState( CKEDITOR.TRISTATE_OFF );\r
-                                               };\r
+                                       {\r
+                                               _.on = 0;\r
+                                               me.setState( CKEDITOR.TRISTATE_OFF );\r
+                                       };\r
                        }\r
                }\r
        });\r