Ticket #2696: 2696_2.patch

_whatsnew.html

@@ -116 +116 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2649">#2649</a>] Fixed a JavaScript error
                         in IE when user tries to search with the "Match whole word" option enabled and the matched word is
                         at exactly the end of document.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2696">#2696</a>] Fixed non-working
+                        autogrow plugin.</li>
         </ul>
         <p>
                 <a href="_whatsnew_history.html">See previous versions history</a></p>

editor/plugins/autogrow/fckplugin.js

@@ -22 +22 @@
  * height (FCKConfig.AutoGrowMax), based on its contents.
  */
 
-var FCKAutoGrow_Min = window.frameElement.offsetHeight ;
+var FCKAutoGrow = {
+        MIN_HEIGHT : window.frameElement.offsetHeight,
 
-function FCKAutoGrow_Check()
-{
-        var oInnerDoc = FCK.EditorDocument ;
+        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" ;
 
-        var iFrameHeight, iInnerHeight ;
+                                // 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() ;
+                                }
+                        }
+                }
+        },
 
-        if ( FCKBrowserInfo.IsIE )
+        CheckEditorStatus : function( sender, status )
         {
-                iFrameHeight = FCK.EditorWindow.frameElement.offsetHeight ;
-                iInnerHeight = oInnerDoc.body.scrollHeight ;
-        }
-        else
+                if ( status == FCK_STATUS_COMPLETE )
+                        FCKAutoGrow.Check() ;
+        },
+
+        GetEffectiveHeight : function( height )
         {
-                iFrameHeight = FCK.EditorWindow.innerHeight ;
-                iInnerHeight = oInnerDoc.body.offsetHeight ;
-        }
+                if ( height < FCKAutoGrow.MIN_HEIGHT )
+                        height = FCKAutoGrow.MIN_HEIGHT;
+                else
+                {
+                        var max = FCKConfig.AutoGrowMax;
+                        if ( max && max > 0 && height > max )
+                                height = max;
+                }
+                
+                return height;
+        },
 
-        var iDiff = iInnerHeight - iFrameHeight ;
-
-        if ( iDiff != 0 )
+        GetHeightDelta : function()
         {
-                var iMainFrameSize = window.frameElement.offsetHeight ;
+                var oInnerDoc = FCK.EditorDocument ;
 
-                if ( iDiff > 0 && iMainFrameSize < FCKConfig.AutoGrowMax )
+                var iFrameHeight ;
+                var iInnerHeight ;
+
+                if ( FCKBrowserInfo.IsIE )
                 {
-                        iMainFrameSize += iDiff ;
-                        if ( iMainFrameSize > FCKConfig.AutoGrowMax )
-                                iMainFrameSize = FCKConfig.AutoGrowMax ;
+                        iFrameHeight = FCK.EditorWindow.frameElement.offsetHeight ;
+                        iInnerHeight = oInnerDoc.body.scrollHeight ;
                 }
-                else if ( iDiff < 0 && iMainFrameSize > FCKAutoGrow_Min )
+                else
                 {
-                        iMainFrameSize += iDiff ;
-                        if ( iMainFrameSize < FCKAutoGrow_Min )
-                                iMainFrameSize = FCKAutoGrow_Min ;
+                        iFrameHeight = FCK.EditorWindow.innerHeight ;
+                        iInnerHeight = oInnerDoc.body.offsetHeight +
+                                ( parseInt( FCKDomTools.GetCurrentElementStyle( oInnerDoc.body, 'margin-top' ) ) || 0 ) +
+                                ( parseInt( FCKDomTools.GetCurrentElementStyle( oInnerDoc.body, 'margin-bottom' ) ) || 0 ) ;
                 }
-                else
+
+                return iInnerHeight - iFrameHeight ;
+        },
+
+        SetListeners : function()
+        {
+                if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
                         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() ;
+                FCK.EditorWindow.attachEvent( 'onscroll', FCKAutoGrow.Check ) ;
+                FCK.EditorDocument.attachEvent( 'onkeyup', FCKAutoGrow.Check ) ;
         }
-}
+};
 
-FCK.AttachToOnSelectionChange( FCKAutoGrow_Check ) ;
+FCK.AttachToOnSelectionChange( FCKAutoGrow.Check ) ;
 
-function FCKAutoGrow_SetListeners()
-{
-        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
-                return ;
-
-        FCK.EditorWindow.attachEvent( 'onscroll', FCKAutoGrow_Check ) ;
-        FCK.EditorDocument.attachEvent( 'onkeyup', 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 ) ;