Ticket #6212: 6212.patch

_source/themes/default/theme.js

@@ -321 +321 @@
  * @example
  * editor.resize( '100%', 450, true );
  */
-CKEDITOR.editor.prototype.resize = function( width, height, isContentHeight, resizeInner )
-{
-        var container = this.container,
-                contents = CKEDITOR.document.getById( 'cke_contents_' + this.name ),
-                outer = resizeInner ? container.getChild( 1 ) : container;
+( function()
+{
+
+        var resizerFixer = CKEDITOR.tools.withInterval( function( container )
+        {
+                // We can't simply hide the entire editor otherwise it breaks the host page scroll. (#6212)
+                container.setStyle( 'display', 'inline-block' );
+                setTimeout( function() { container.setStyle( 'display', 'block' ); }, 0 );
+        }, 500 );
+
+        CKEDITOR.editor.prototype.resize = function( width, height, isContentHeight, resizeInner )
+        {
+                var container = this.container,
+                        contents = CKEDITOR.document.getById( 'cke_contents_' + this.name ),
+                        outer = resizeInner ? container.getChild( 1 ) : container;
 
-        // Resize the width first.
-        // WEBKIT BUG: Webkit requires that we put the editor off from display when we
-        // resize it. If we don't, the browser crashes!
-        CKEDITOR.env.webkit && outer.setStyle( 'display', 'none' );
-        // Set as border box width. (#5353)
-        outer.setSize( 'width',  width, true );
-        if ( CKEDITOR.env.webkit )
-        {
-                outer.$.offsetWidth;
-                outer.setStyle( 'display', '' );
-        }
+                // WEBKIT: Webkit requires a chrome re-layout. (#5729)
+                CKEDITOR.env.webkit && resizerFixer( this, null, outer );
+
+                // Set as border box width. (#5353)
+                outer.setSize( 'width',  width, true );
 
-        // Get the height delta between the outer table and the content area.
-        // If we're setting the content area's height, then we don't need the delta.
-        var delta = isContentHeight ? 0 : ( outer.$.offsetHeight || 0 ) - ( contents.$.clientHeight || 0 );
-        contents.setStyle( 'height', Math.max( height - delta, 0 ) + 'px' );
+                // Get the height delta between the outer table and the content area.
+                // If we're setting the content area's height, then we don't need the delta.
+                var delta = isContentHeight ? 0 : ( outer.$.offsetHeight || 0 ) - ( contents.$.clientHeight || 0 );
+                contents.setStyle( 'height', Math.max( height - delta, 0 ) + 'px' );
 
-        // Emit a resize event.
-        this.fire( 'resize' );
-};
+                // Emit a resize event.
+                this.fire( 'resize' );
+        };
 
+
+} )();
+
 /**
  * Gets the element that can be freely used to check the editor size. This method
  * is mainly used by the resize plugin, which adds a UI handle that can be used

_source/core/tools.js

@@ -756 +756 @@
                 genKey : function()
                 {
                         return Array.prototype.slice.call( arguments ).join( '-' );
-                }
-        };
+                },
+
+                /**
+                 *  Guarantee a function to be executed with at least some interval even when invoked consequently..
+                 *  <strong>Note:</strong> The proxy function should be invoked with the first argument a target object subjected to defer the function.
+                 *  @param {Function} fn The function to be executed.
+                 *  @param {Number} interval The least amount of time between each execution.
+                 *  @return {Function} proxy(target, scope, arguments) The proxy function to substitute the original function.
+                 */
+                withInterval : ( function()
+                {
+                        var id = 0;
+                        return function( fn, interval )
+                                        {
+                                                return ( function( taskId )
+                                                {
+                                                        taskId = 'task_' + taskId;
+                                                        return function( obj, scope )
+                                                        {
+                                                                function clean()
+                                                                {
+                                                                        return setTimeout( function()
+                                                                        {
+                                                                                delete obj[ taskId ];
+                                                                        }, interval );
+                                                                }
+
+                                                                if ( !obj[ taskId ] )
+                                                                        fn.apply( scope, Array.prototype.slice.call( arguments, 2 ) );
+                                                                else
+                                                                        clearTimeout( obj[ taskId ] );
+
+                                                                obj[ taskId ] = clean();
+                                                        };
+
+                                                } )( id++ );
+                                        }
+
+                } )()
+        };
 })();
 
 // PACKAGER_RENAME( CKEDITOR.tools )