Ticket #8050: 8050_2.patch

_source/plugins/autogrow/plugin.js

@@ -8 +8 @@
  */
 (function(){
 
-        var parts = [ "margin-top","margin-bottom","border-top-width", "border-bottom-width", "padding-top",  "padding-bottom" ];
-
-        function nonContentHeight( element )
-        {
-                var adjustment = 0;
-                for ( var i = 0, len = parts.length; i < len; i++ )
-                        adjustment += parseInt( element.getComputedStyle( parts[ i ] ) || 0, 10 ) || 0;
-                return adjustment;
-        }
-
-        // Count for spaces outside of  the actual content.
-        function extra( element )
-        {
-                var margin = 0;
-                margin += nonContentHeight( element);
-                if ( element.is( 'html' ) )
-                        margin += nonContentHeight( element.getDocument().getBody() );
-                return margin;
-        }
-
         // Actual content height, figured out by simply check the last element's document position.
         function docContentHeight( doc )
         {
                 var last = doc.getBody().getLast();
 
                 // Last node is not measurable,  create a temporary marker element.
-                if ( !last || last.type != CKEDITOR.NODE_ELEMENT || last.is( 'br' ) )
+                if ( !last || last.type != CKEDITOR.NODE_ELEMENT || last.is( 'br' ) || !last.isVisible() )
                 {
                         last = CKEDITOR.dom.element.createFromHtml( '<span>' + ( CKEDITOR.env.webkit ? '&nbsp;' : '' ) + '</span>', doc );
                         doc.getBody().append( last );
                         last.isMarker = 1;
                 }
 
-                var height = last.getDocumentPosition( doc ).y + last.$.offsetHeight + parseInt( last.getComputedStyle( 'margin-bottom' ) || 0, 10 );
+                var height = last.getDocumentPosition( doc ).y + last.$.offsetHeight + ( parseInt( last.getComputedStyle( 'margin-bottom' ), 10 ) || 0 );
                 last.isMarker && last.remove();
                 return height;
         }
 
+        function hasScrollbar( element )
+        {
+                return element.$.clientHeight != element.$.scrollHeight;
+        }
+
         CKEDITOR.plugins.add( 'autogrow',
         {
                 init : function( editor )
                 {
+                        // The offset size between content height and editor size.
                         var contentMargin = 0;
                         var resizeEditor = function( editor )
                         {
@@ -65 +51 @@
 
                                 // Quirks mode overflows body except for IE9, standards overflows document element.
                                 var scrollable = !CKEDITOR.env.ie9Compat && doc.$.compatMode == 'BackCompat' ? body : htmlElement,
-                                        contentHeight = docContentHeight( doc ),
-                                        delta = contentHeight - scrollable.$.clientHeight + extra( scrollable );
+                                        contentHeight = docContentHeight( doc );
 
-                                // Delta height from either increasing or decreasing.
-                                if ( delta )
+                                // For the first time, measures the margin size by growing the editor lively until scroll-bar disappears.
+                                if ( !contentMargin )
                                 {
-                                        newHeight = currentHeight + delta;
-                                        var min = editor.config.autoGrow_minHeight,
-                                                max = editor.config.autoGrow_maxHeight;
+                                        var increase = contentHeight > scrollable.$.clientHeight,
+                                                measureHeight = contentHeight;
+                                        do
+                                                resizeable.setStyle( 'height', ( increase ? measureHeight++ : measureHeight-- ) + 'px' );
+                                        while ( !increase ^ hasScrollbar( scrollable ) );
+
+                                        // Compensate the overhead from decreasing editor height.
+                                        if ( !increase )
+                                        {
+                                                do
+                                                        resizeable.setStyle( 'height', measureHeight++ + 'px' );
+                                                while ( hasScrollbar( scrollable ) );
+                                        }
+                                        contentMargin = measureHeight - contentHeight;
+                                }
+
+                                newHeight = contentHeight + contentMargin;
+
+                                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 );
+                                ( min == undefined ) && ( editor.config.autoGrow_minHeight = min = 200 );
+                                if ( min )
+                                        newHeight = Math.max( newHeight, min );
+                                if ( max )
+                                        newHeight = Math.min( newHeight, max );
 
-                                        if ( newHeight != currentHeight )
-                                        {
-                                                newHeight = editor.fire( 'autoGrow', { currentHeight : currentHeight, newHeight : newHeight } ).newHeight;
-                                                resizeable.setStyle( 'height', newHeight + 'px' );
-                                                editor.fire( 'resize' );
-                                                // Calculate and record now the margin between the actual content size and page size.
-                                                setTimeout( function() { contentMargin = scrollable.scrollHeight - body.offsetHeight; }, 0 );
-
-                                        }
-                                }
+                                if ( newHeight != currentHeight )
+                                {
+                                        newHeight = editor.fire( 'autoGrow', { currentHeight : currentHeight, newHeight : newHeight } ).newHeight;
+                                        resizeable.setStyle( 'height', newHeight + 'px' );
+                                        editor.fire( 'resize' );
+                                }
                         };
 
                         for ( var eventName in { contentDom:1, key:1, selectionChange:1, insertElement:1 } )