X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fmaximize%2Fplugin.js;h=6d31595b2d681120d20f68bd20915366796b1279;hb=3fe9cac293e090ea459a3ee10d78cbe9e1dd0e03;hp=5b405d054d747fb08a741262eefbb4fb0a7ec437;hpb=48b1db88210b4160dce439c6e3e32e14af8c106b;p=ckeditor.git diff --git a/_source/plugins/maximize/plugin.js b/_source/plugins/maximize/plugin.js index 5b405d0..6d31595 100644 --- a/_source/plugins/maximize/plugin.js +++ b/_source/plugins/maximize/plugin.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -85,7 +85,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license for ( var i in all ) { var one = all[ i ]; - if ( one.mode == 'wysiwyg' ) + if ( one.mode == 'wysiwyg' && !one.readOnly ) { var body = one.document.getBody(); // Refresh 'contentEditable' otherwise @@ -154,7 +154,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license editor.addCommand( 'maximize', { - modes : { wysiwyg : 1, source : 1 }, + // Disabled on iOS (#8307). + modes : { wysiwyg : !CKEDITOR.env.iOS, source : !CKEDITOR.env.iOS }, + readOnly : 1, editorFocus : false, exec : function() { @@ -203,7 +205,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license mainDocument.getDocumentElement().setStyles( styles ); !CKEDITOR.env.gecko && mainDocument.getDocumentElement().setStyle( 'position', 'fixed' ); - mainDocument.getBody().setStyles( styles ); + !( CKEDITOR.env.gecko && CKEDITOR.env.quirks ) && mainDocument.getBody().setStyles( styles ); // Scroll to the top left (IE needs some time for it - #4923). CKEDITOR.env.ie ? @@ -211,7 +213,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license mainWindow.$.scrollTo( 0, 0 ); // Resize and move to top left. - container.setStyle( 'position', 'absolute' ); + // Special treatment for FF Quirks (#7284) + container.setStyle( 'position', CKEDITOR.env.gecko && CKEDITOR.env.quirks ? 'fixed' : 'absolute' ); container.$.offsetLeft; // SAFARI BUG: See #2066. container.setStyles( {