Ticket #2696: 2696.patch

editor/plugins/autogrow/fckplugin.js

@@ -22 +22 @@
  * height (FCKConfig.AutoGrowMax), based on its contents.
  */
 
-var FCKAutoGrow_Min = window.frameElement.offsetHeight ;
+FCKAutoGrow = new Object();
 
-function FCKAutoGrow_Check()
+FCKAutoGrow.MIN_HEIGHT = window.frameElement.offsetHeight ;
+
+FCKAutoGrow.Check = function()
 {
+    var delta = FCKAutoGrow.GetHeightDelta() ;
+        if ( delta != 0 )
+        {
+                var newHeight = window.frameElement.offsetHeight + delta ;
+                
+                newHeight = FCKAutoGrow.GetEffectiveHeight( newHeight ) ;
+                
+        if ( newHeight != window.frameElement.height )
+        {
+            window.frameElement.style.height = newHeight + "px" ;
+
+                // Gecko browsers use an onresize handler to update the innermost
+                // IFRAME's height. If the document is modified before the onresize
+                // is triggered, the plugin will miscalculate the new height. Thus,
+                // forcibly trigger onresize. #1336
+                if ( typeof window.onresize == 'function' )
+                {
+                        window.onresize() ;
+                }
+        }
+        }
+}
+
+FCKAutoGrow.CheckEditorStatus = function( sender, status )
+{
+        if ( status == FCK_STATUS_COMPLETE )
+                FCKAutoGrow.Check() ;
+}
+
+FCKAutoGrow.GetEffectiveHeight = function( height )
+{
+    if ( height < FCKAutoGrow.MIN_HEIGHT )
+        height = FCKAutoGrow.MIN_HEIGHT;
+    else
+    {
+        var max = FCKConfig.AutoGrowMax;
+        if ( max && max > 0 && height > max )
+            height = max;
+    }
+    
+    return height;
+}
+
+FCKAutoGrow.GetHeightDelta = function()
+{
         var oInnerDoc = FCK.EditorDocument ;
 
-        var iFrameHeight, iInnerHeight ;
+        var iFrameHeight ;
+        var iInnerHeight ;
 
         if ( FCKBrowserInfo.IsIE )
         {
@@ -38 +86 @@
         else
         {
                 iFrameHeight = FCK.EditorWindow.innerHeight ;
-                iInnerHeight = oInnerDoc.body.offsetHeight ;
+                iInnerHeight = oInnerDoc.body.offsetHeight +
+                        ( parseInt( FCKDomTools.GetCurrentElementStyle( oInnerDoc.body, 'margin-top' ) ) || 0 ) +
+                        ( parseInt( FCKDomTools.GetCurrentElementStyle( oInnerDoc.body, 'margin-bottom' ) ) || 0 ) ;
         }
 
-        var iDiff = iInnerHeight - iFrameHeight ;
-
-        if ( iDiff != 0 )
-        {
-                var iMainFrameSize = window.frameElement.offsetHeight ;
-
-                if ( iDiff > 0 && iMainFrameSize < FCKConfig.AutoGrowMax )
-                {
-                        iMainFrameSize += iDiff ;
-                        if ( iMainFrameSize > FCKConfig.AutoGrowMax )
-                                iMainFrameSize = FCKConfig.AutoGrowMax ;
-                }
-                else if ( iDiff < 0 && iMainFrameSize > FCKAutoGrow_Min )
-                {
-                        iMainFrameSize += iDiff ;
-                        if ( iMainFrameSize < FCKAutoGrow_Min )
-                                iMainFrameSize = FCKAutoGrow_Min ;
-                }
-                else
-                        return ;
-
-                window.frameElement.height = iMainFrameSize ;
-
-                // Gecko browsers use an onresize handler to update the innermost
-                // IFRAME's height. If the document is modified before the onresize
-                // is triggered, the plugin will miscalculate the new height. Thus,
-                // forcibly trigger onresize. #1336
-                if ( typeof window.onresize == 'function' )
-                        window.onresize() ;
-        }
+        return iInnerHeight - iFrameHeight ;
 }
 
-FCK.AttachToOnSelectionChange( FCKAutoGrow_Check ) ;
-
-function FCKAutoGrow_SetListeners()
+FCKAutoGrow.SetListeners = function()
 {
         if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
                 return ;
 
-        FCK.EditorWindow.attachEvent( 'onscroll', FCKAutoGrow_Check ) ;
-        FCK.EditorDocument.attachEvent( 'onkeyup', FCKAutoGrow_Check ) ;
+        FCK.EditorWindow.attachEvent( 'onscroll', FCKAutoGrow.Check ) ;
+        FCK.EditorDocument.attachEvent( 'onkeyup', FCKAutoGrow.Check ) ;
 }
 
+FCK.AttachToOnSelectionChange( FCKAutoGrow.Check ) ;
+
 if ( FCKBrowserInfo.IsIE )
-{
-//      FCKAutoGrow_SetListeners() ;
-        FCK.Events.AttachEvent( 'OnAfterSetHTML', FCKAutoGrow_SetListeners ) ;
-}
+        FCK.Events.AttachEvent( 'OnAfterSetHTML', FCKAutoGrow.SetListeners ) ;
 
-function FCKAutoGrow_CheckEditorStatus( sender, status )
-{
-        if ( status == FCK_STATUS_COMPLETE )
-                FCKAutoGrow_Check() ;
-}
-
-FCK.Events.AttachEvent( 'OnStatusChange', FCKAutoGrow_CheckEditorStatus ) ;
+FCK.Events.AttachEvent( 'OnStatusChange', FCKAutoGrow.CheckEditorStatus ) ;