Ticket #8050: 8050_10.patch

_source/plugins/autogrow/plugin.js

@@ -6 +6 @@
 /**
  * @file AutoGrow plugin
  */
-(function(){
-        var resizeEditor = function( editor )
-        {
-                if ( !editor.window )
-                        return;
-                var doc = editor.document,
-                        currentHeight = editor.window.getViewPaneSize().height,
-                        newHeight;
+(function()
+{
+        CKEDITOR.plugins.add( 'autogrow',
+        {
+                init : function( editor )
+                {
+                        function resizeEditor()
+                        {
+                                if ( !editor.window )
+                                        return;
+
+                                var doc = editor.document,
+                                                iframe = new CKEDITOR.dom.element( doc.getWindow().$.frameElement ),
+                                                resizeable = editor.getResizable( 1 ),
+                                                body = doc.getBody(),
+                                                htmlElement = doc.getDocumentElement(),
+                                                currentHeight = resizeable.$.offsetHeight,
+                                                newHeight;
 
-                // We can not use documentElement to calculate the height for IE (#6061).
-                // It is not good for IE Quirks, yet using offsetHeight would also not work as expected (#6408).
-                // We do the same for FF because of the html height workaround (#6341).
-                if ( CKEDITOR.env.ie || CKEDITOR.env.gecko )
-                        newHeight = doc.getBody().$.scrollHeight + ( CKEDITOR.env.ie && CKEDITOR.env.quirks ? 0 : 24 );
-                else
-                        newHeight = doc.getDocumentElement().$.offsetHeight;
+                                // Quirks mode overflows body except for IE9, standards overflows document element.
+                                var scrollable = !CKEDITOR.env.ie9Compat && doc.$.compatMode == 'BackCompat' ? body : htmlElement;
 
-                var min = editor.config.autoGrow_minHeight,
-                        max = editor.config.autoGrow_maxHeight;
-                ( min == undefined ) && ( editor.config.autoGrow_minHeight = min = 200 );
-                if ( min )
-                        newHeight = Math.max( newHeight, min );
-                if ( max )
-                        newHeight = Math.min( newHeight, max );
+                                // Content height
+                                iframe.setStyle( 'height', '1px' );
+                                newHeight = scrollable.$.scrollHeight;
+
+                                // Count for the height of h-scrollbar.
+                                iframe.setStyle( 'height', newHeight + 'px' );
+                                newHeight += scrollable.$.scrollWidth > scrollable.$.clientWidth ? scrollable.$.scrollHeight - scrollable.$.clientHeight : 0;
+
+                                // Now restore iframe height.
+                                iframe.setStyle( 'height', '100%' );
+
+                                var min = editor.config.autoGrow_minHeight || 0,
+                                                max = editor.config.autoGrow_maxHeight || Infinity;
+
+                                newHeight = Math.max( newHeight, min );
+                                newHeight = Math.min( newHeight, max );
 
-                if ( newHeight != currentHeight )
-                {
-                        newHeight = editor.fire( 'autoGrow', { currentHeight : currentHeight, newHeight : newHeight } ).newHeight;
-                        editor.resize( editor.container.getStyle( 'width' ), newHeight, true );
-                }
-        };
-        CKEDITOR.plugins.add( 'autogrow',
-        {
-                init : function( editor )
-                {
+                                if ( newHeight != currentHeight )
+                                {
+                                        newHeight = editor.fire( 'autoGrow', { currentHeight : currentHeight, newHeight : newHeight } ).newHeight;
+                                        resizeable.setStyle( 'height', newHeight + 'px' );
+                                        editor.fire( 'resize' );
+
+                                        // Make sure v-scrollbar isn't invisible after all.
+                                        newHeight < max ?
+                                                scrollable.setStyle( 'overflow-y', 'hidden' )
+                                                : scrollable.removeStyle( 'overflow-y' );
+                                }
+                        }
+
                         for ( var eventName in { contentDom:1, key:1, selectionChange:1, insertElement:1 } )
                         {
                                 editor.on( eventName, function( evt )
@@ -51 +68 @@
                                                 // Disable autogrow when the editor is maximized .(#6339)
                                                 ( !maximize || maximize.state != CKEDITOR.TRISTATE_ON ) )
                                         {
-                                                setTimeout( function(){ resizeEditor( evt.editor ); }, 100 );
+                                                setTimeout( function(){ resizeEditor(); }, 0 );
                                         }
-                                });
-                        }
+                        });
+                }
                 }
         });
 })();