X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fpanelbutton%2Fplugin.js;h=1bddb4bda1cfc5b3e99186ab3e0ca40593327b97;hb=9afde8772159bd3436f1f5b7862960307710ae5a;hp=4e017b4ead4bcee3011f1003e7e50057742f704c;hpb=059b4c2fef02528bf1af189f7996e80652faddfb;p=ckeditor.git

diff --git a/_source/plugins/panelbutton/plugin.js b/_source/plugins/panelbutton/plugin.js
index 4e017b4..1bddb4b 100644
--- a/_source/plugins/panelbutton/plugin.js
+++ b/_source/plugins/panelbutton/plugin.js
@@ -93,7 +93,7 @@ CKEDITOR.UI_PANELBUTTON = 4;
 					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,7 +104,6 @@ CKEDITOR.UI_PANELBUTTON = 4;
 						if ( me.className )
 							this.element.getFirst().addClass( me.className + '_panel' );
 
-						_.oldState = me._.state;
 						me.setState( CKEDITOR.TRISTATE_ON );
 
 						_.on = 1;
@@ -113,16 +112,16 @@ CKEDITOR.UI_PANELBUTTON = 4;
 							me.onOpen();
 					};
 
-				panel.onHide = function()
+				panel.onHide = function( preventOnClose )
 					{
 						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;
 
-						if ( me.onClose )
+						if ( !preventOnClose && me.onClose )
 							me.onClose();
 					};
 
@@ -136,10 +135,10 @@ CKEDITOR.UI_PANELBUTTON = 4;
 					this.onBlock( panel, block );
 
 				block.onHide = function()
-						{
-								_.on = 0;
-								me.setState( CKEDITOR.TRISTATE_OFF );
-						};
+					{
+						_.on = 0;
+						me.setState( CKEDITOR.TRISTATE_OFF );
+					};
 			}
 		}
 	});