X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fmaximize%2Fplugin.js;h=fa2f7913098070bf8bdf3e074b79b2a7d7c180fa;hb=614511639979907ceb0da3614122a4d8eb963ad4;hp=a3a260a6e4462974ee410bd01d60d525ab847593;hpb=941b0a9ba4e673e292510d80a5a86806994b8ea6;p=ckeditor.git

diff --git a/_source/plugins/maximize/plugin.js b/_source/plugins/maximize/plugin.js
index a3a260a..fa2f791 100644
--- a/_source/plugins/maximize/plugin.js
+++ b/_source/plugins/maximize/plugin.js
@@ -10,8 +10,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		if ( !formElement || formElement.type != CKEDITOR.NODE_ELEMENT || formElement.getName() != 'form' )
 			return [];
 
-		var hijackRecord = [];
-		var hijackNames = [ 'style', 'className' ];
+		var hijackRecord = [],
+			hijackNames = [ 'style', 'className' ];
 		for ( var i = 0 ; i < hijackNames.length ; i++ )
 		{
 			var name = hijackNames[i];
@@ -78,13 +78,50 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		restoreFormStyles( data );
 	}
 
-	function getResizeHandler( mainWindow, editor )
+	function refreshCursor( editor )
 	{
-		return function()
+		// Refresh all editor instances on the page (#5724).
+		var all = CKEDITOR.instances;
+		for ( var i in all )
 		{
-			var viewPaneSize = mainWindow.getViewPaneSize();
-			editor.resize( viewPaneSize.width, viewPaneSize.height, null, true );
-		};
+			var one = all[ i ];
+			if ( one.mode == 'wysiwyg' )
+			{
+				var body = one.document.getBody();
+				// Refresh 'contentEditable' otherwise
+				// DOM lifting breaks design mode. (#5560)
+				body.setAttribute( 'contentEditable', false );
+				body.setAttribute( 'contentEditable', true );
+			}
+		}
+
+		if ( editor.focusManager.hasFocus )
+		{
+			editor.toolbox.focus();
+			editor.focus();
+		}
+	}
+
+	/**
+	 * Adding an iframe shim to this element, OR removing the existing one if already applied.
+	 * Note: This will only affect IE version below 7.
+	 */
+	 function createIframeShim( element )
+	{
+		if ( !CKEDITOR.env.ie || CKEDITOR.env.version > 6 )
+			return null;
+
+		var shim = CKEDITOR.dom.element.createFromHtml( '<iframe frameborder="0" tabindex="-1"' +
+					' src="javascript:' +
+					   'void((function(){' +
+						   'document.open();' +
+						   ( CKEDITOR.env.isCustomDomain() ? 'document.domain=\'' + this.getDocument().$.domain + '\';' : '' ) +
+						   'document.close();' +
+					   '})())"' +
+					' style="display:block;position:absolute;z-index:-1;' +
+					'progid:DXImageTransform.Microsoft.Alpha(opacity=0);' +
+					'"></iframe>' );
+		return element.append( shim, true );
 	}
 
 	CKEDITOR.plugins.add( 'maximize',
@@ -92,18 +129,25 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		init : function( editor )
 		{
 			var lang = editor.lang;
-			var mainDocument = CKEDITOR.document;
-			var mainWindow = mainDocument.getWindow();
+			var mainDocument = CKEDITOR.document,
+				mainWindow = mainDocument.getWindow();
 
 			// Saved selection and scroll position for the editing area.
-			var savedSelection;
-			var savedScroll;
+			var savedSelection,
+				savedScroll;
 
 			// Saved scroll position for the outer window.
 			var outerScroll;
 
+			var shim;
+
 			// Saved resize handler function.
-			var resizeHandler = getResizeHandler( mainWindow, editor );
+			function resizeHandler()
+			{
+				var viewPaneSize = mainWindow.getViewPaneSize();
+				shim && shim.setStyles( { width : viewPaneSize.width + 'px', height : viewPaneSize.height + 'px' } );
+				editor.resize( viewPaneSize.width, viewPaneSize.height, null, true );
+			}
 
 			// Retain state after mode switches.
 			var savedState = CKEDITOR.TRISTATE_OFF;
@@ -114,7 +158,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					editorFocus : false,
 					exec : function()
 					{
-						var container = editor.container.getChild( 0 );
+						var container = editor.container.getChild( 1 );
 						var contents = editor.getThemeSpace( 'contents' );
 
 						// Save current selection and scroll position in editing area.
@@ -150,20 +194,17 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							container.setCustomData( 'maximize_saved_styles', saveStyles( container, true ) );
 
 							// Hide scroll bars.
-							if ( CKEDITOR.env.ie )
-							{
-								mainDocument.$.documentElement.style.overflow =
-									mainDocument.getBody().$.style.overflow = 'hidden';
-							}
-							else
-							{
-								mainDocument.getBody().setStyles(
-									{
-										overflow : 'hidden',
-										width : '0px',
-										height : '0px'
-									} );
-							}
+							var viewPaneSize = mainWindow.getViewPaneSize();
+							var styles =
+								{
+									overflow : 'hidden',
+									width : 0,
+									height : 0
+								};
+
+							mainDocument.getDocumentElement().setStyles( styles );
+							!CKEDITOR.env.gecko && mainDocument.getDocumentElement().setStyle( 'position', 'fixed' );
+							mainDocument.getBody().setStyles( styles );
 
 							// Scroll to the top left (IE needs some time for it - #4923).
 							CKEDITOR.env.ie ?
@@ -171,7 +212,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								mainWindow.$.scrollTo( 0, 0 );
 
 							// Resize and move to top left.
-							var viewPaneSize = mainWindow.getViewPaneSize();
 							container.setStyle( 'position', 'absolute' );
 							container.$.offsetLeft;			// SAFARI BUG: See #2066.
 							container.setStyles(
@@ -180,7 +220,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 									left : '0px',
 									top : '0px'
 								} );
-							editor.resize( viewPaneSize.width, viewPaneSize.height, null, true );
+
+							shim =  createIframeShim( container );		// IE6 select element penetration when maximized. (#4459)
+
+							// Add cke_maximized class before resize handle since that will change things sizes (#5580)
+							container.addClass( 'cke_maximized' );
+
+							resizeHandler();
 
 							// Still not top left? Fix it. (Bug #174)
 							var offset = container.getDocumentPosition();
@@ -190,8 +236,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 									top : ( -1 * offset.y ) + 'px'
 								} );
 
-							// Add cke_maximized class.
-							container.addClass( 'cke_maximized' );
+							// Fixing positioning editor chrome in Firefox break design mode. (#5149)
+							CKEDITOR.env.gecko && refreshCursor( editor );
+
 						}
 						else if ( this.state == CKEDITOR.TRISTATE_ON )	// Restore from fullscreen if the state is on.
 						{
@@ -221,6 +268,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							// Remove cke_maximized class.
 							container.removeClass( 'cke_maximized' );
 
+							if ( shim )
+							{
+								shim.remove();
+								shim = null;
+							}
+
 							// Emit a resize event, because this time the size is modified in
 							// restoreStyles.
 							editor.fire( 'resize' );
@@ -242,6 +295,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						{
 							if ( savedSelection )
 							{
+								// Fixing positioning editor chrome in Firefox break design mode. (#5149)
+								CKEDITOR.env.gecko && refreshCursor( editor );
+
 								editor.getSelection().selectRanges(savedSelection);
 								var element = editor.getSelection().getStartElement();
 								element && element.scrollIntoView( true );
@@ -273,10 +329,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					command : 'maximize'
 				} );
 
-			// Restore the command state after mode change.
+			// Restore the command state after mode change, unless it has been changed to disabled (#6467)
 			editor.on( 'mode', function()
 				{
-					editor.getCommand( 'maximize' ).setState( savedState );
+					var command = editor.getCommand( 'maximize' );
+					command.setState( command.state == CKEDITOR.TRISTATE_DISABLED ? CKEDITOR.TRISTATE_DISABLED : savedState );
 				}, null, null, 100 );
 		}
 	} );