function getPanel( editor, doc, parentElement, definition, level )\r
{\r
// Generates the panel key: docId-eleId-skinName-langDir[-uiColor][-CSSs][-level]\r
- var key =\r
- doc.getUniqueId() +\r
- '-' + parentElement.getUniqueId() +\r
- '-' + editor.skinName +\r
- '-' + editor.lang.dir +\r
- ( ( editor.uiColor && ( '-' + editor.uiColor ) ) || '' ) +\r
- ( ( definition.css && ( '-' + definition.css ) ) || '' ) +\r
- ( ( level && ( '-' + level ) ) || '' );\r
+ var key = CKEDITOR.tools.genKey( doc.getUniqueId(), parentElement.getUniqueId(), editor.skinName, editor.lang.dir,\r
+ editor.uiColor || '', definition.css || '', level || '' );\r
\r
var panel = panels[ key ];\r
\r
{\r
$ : function( editor, parentElement, definition, level )\r
{\r
- definition.forceIFrame = true;\r
+ definition.forceIFrame = 1;\r
\r
var doc = parentElement.getDocument(),\r
panel = getPanel( editor, doc, parentElement, definition, level || 0 ),\r
children : [],\r
dir : editor.lang.dir\r
};\r
+\r
+ editor.on( 'mode', function(){ this.hide(); }, this );\r
},\r
\r
proto :\r
block = panel.showBlock( name );\r
\r
this.allowBlur( false );\r
- isShowing = true;\r
+ isShowing = 1;\r
\r
var element = this.element,\r
iframe = this._.iframe,\r
\r
element.setStyles(\r
{\r
- top : '-30000px',\r
+ top : top + 'px',\r
+ left: 0,\r
display : ''\r
});\r
+\r
// Don't use display or visibility style because we need to\r
// calculate the rendering layout later and focus the element.\r
element.setOpacity( 0 );\r
}\r
}\r
\r
+ // Trigger the onHide event of the previously active panel to prevent\r
+ // incorrect styles from being applied (#6170)\r
+ var innerElement = element.getFirst(),\r
+ activePanel;\r
+ if ( ( activePanel = innerElement.getCustomData( 'activePanel' ) ) )\r
+ activePanel.onHide && activePanel.onHide.call( this, 1 );\r
+ innerElement.setCustomData( 'activePanel', this );\r
+\r
element.setStyles(\r
{\r
top : top + 'px',\r
// We need this get fired manually because of unfired focus() function.\r
this.allowBlur( true );\r
}, 0, this);\r
- }, 0, this);\r
+ }, CKEDITOR.env.air ? 200 : 0, this);\r
this.visible = 1;\r
\r
if ( this.onShow )\r
this.onShow.call( this );\r
\r
- isShowing = false;\r
+ isShowing = 0;\r
},\r
\r
hide : function()\r
this.hideChild();\r
this.element.setStyle( 'display', 'none' );\r
this.visible = 0;\r
+ this.element.getFirst().removeCustomData( 'activePanel' );\r
}\r
},\r
\r