Skip to content
Permalink
Browse files

Merge branch 't/9465'

  • Loading branch information...
Reinmar committed Oct 22, 2012
2 parents 067a18d + 047cf9e commit f6f682f5315352488f6d830f3fcc64533218a5af
Showing with 8 additions and 2 deletions.
  1. +4 −0 plugins/floatpanel/plugin.js
  2. +4 −2 plugins/maximize/plugin.js
@@ -80,6 +80,10 @@ CKEDITOR.plugins.add( 'floatpanel', {
editor.on( 'mode', function() {
this.hide();
}, this );

editor.on( 'resize', function() {
this.hide();
}, this );
},

proto: {
@@ -169,7 +169,8 @@
var currentNode = editor.container;
while ( ( currentNode = currentNode.getParent() ) ) {
currentNode.setCustomData( 'maximize_saved_styles', saveStyles( currentNode ) );
currentNode.setStyle( 'z-index', editor.config.baseFloatZIndex - 1 );
// Show under floatpanels (-1) and context menu (-2).
currentNode.setStyle( 'z-index', editor.config.baseFloatZIndex - 5 );
}
contents.setCustomData( 'maximize_saved_styles', saveStyles( contents, true ) );
container.setCustomData( 'maximize_saved_styles', saveStyles( container, true ) );
@@ -195,7 +196,8 @@
container.setStyle( 'position', CKEDITOR.env.gecko && CKEDITOR.env.quirks ? 'fixed' : 'absolute' );
container.$.offsetLeft; // SAFARI BUG: See #2066.
container.setStyles({
'z-index': editor.config.baseFloatZIndex - 1,
// Show under floatpanels (-1) and context menu (-2).
'z-index': editor.config.baseFloatZIndex - 5,
left: '0px',
top: '0px'
});

0 comments on commit f6f682f

Please sign in to comment.
You can’t perform that action at this time.