vanilla ckeditor-3.6.2

[ckeditor.git] / _source / themes / default / theme.js

diff --git a/_source/themes/default/theme.js b/_source/themes/default/theme.js
index f7ff8e4..6cdfa77 100644 (file)
--- a/_source/themes/default/theme.js
+++ b/_source/themes/default/theme.js
@@ -242,6 +242,20 @@ CKEDITOR.themes.add( 'default', (function()
                                title = body.getChild( 0 ),\r
                                close = body.getChild( 1 );\r
 \r
+                       // IFrame shim for dialog that masks activeX in IE. (#7619)\r
+                       if ( CKEDITOR.env.ie && !CKEDITOR.env.ie6Compat )\r
+                       {\r
+                               var isCustomDomain = CKEDITOR.env.isCustomDomain(),\r
+                                       src = 'javascript:void(function(){' + encodeURIComponent( 'document.open();' + ( isCustomDomain ? ( 'document.domain="' + document.domain + '";' ) : '' ) + 'document.close();' ) + '}())',\r
+                                       iframe = CKEDITOR.dom.element.createFromHtml( '<iframe' +\r
+                                                       ' frameBorder="0"' +\r
+                                                       ' class="cke_iframe_shim"' +\r
+                                                       ' src="' + src + '"' +\r
+                                                       ' tabIndex="-1"' +\r
+                                                       '></iframe>' );\r
+                               iframe.appendTo( body.getParent() );\r
+                       }\r
+\r
                        // Make the Title and Close Button unselectable.\r
                        title.unselectable();\r
                        close.unselectable();\r
@@ -325,25 +339,23 @@ CKEDITOR.editor.prototype.resize = function( width, height, isContentHeight, res
 {\r
        var container = this.container,\r
                contents = CKEDITOR.document.getById( 'cke_contents_' + this.name ),\r
+               contentsFrame = CKEDITOR.env.webkit && this.document && this.document.getWindow().$.frameElement,\r
                outer = resizeInner ? container.getChild( 1 ) : container;\r
 \r
-       // Resize the width first.\r
-       // WEBKIT BUG: Webkit requires that we put the editor off from display when we\r
-       // resize it. If we don't, the browser crashes!\r
-       CKEDITOR.env.webkit && outer.setStyle( 'display', 'none' );\r
        // Set as border box width. (#5353)\r
        outer.setSize( 'width',  width, true );\r
-       if ( CKEDITOR.env.webkit )\r
-       {\r
-               outer.$.offsetWidth;\r
-               outer.setStyle( 'display', '' );\r
-       }\r
+\r
+       // WebKit needs to refresh the iframe size to avoid rendering issues. (1/2) (#8348)\r
+       contentsFrame && ( contentsFrame.style.width = '1%' );\r
 \r
        // Get the height delta between the outer table and the content area.\r
        // If we're setting the content area's height, then we don't need the delta.\r
        var delta = isContentHeight ? 0 : ( outer.$.offsetHeight || 0 ) - ( contents.$.clientHeight || 0 );\r
        contents.setStyle( 'height', Math.max( height - delta, 0 ) + 'px' );\r
 \r
+       // WebKit needs to refresh the iframe size to avoid rendering issues. (2/2) (#8348)\r
+       contentsFrame && ( contentsFrame.style.width = '100%' );\r
+\r
        // Emit a resize event.\r
        this.fire( 'resize' );\r
 };\r