Ticket #3053: 3053_2.patch

_whatsnew.html

@@ -90 +90 @@
                         error when trying to create link for images inside floating div containers.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3925">#3925</a>] Removed obsolete
                         parentWindow reference from FCKDialog.OpenDialog().</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3053">#3053</a>] Fixed problems with
+                        the height of the content area in Safari and Chrome.</li>
         </ul>
         <p>
                 <a href="_whatsnew_history.html">See previous versions history</a></p>

editor/_source/internals/fck.js

@@ -494 +494 @@
                         FCK.Events.FireEvent( 'OnAfterSetHTML' ) ;
                 }
 
-                if ( FCKBrowserInfo.IsGecko )
+                if ( window.onresize )
                         window.onresize() ;
         },
 

editor/_source/internals/fcktoolbarset.js

@@ -239 +239 @@
         this._Document.getElementById( 'xCollapsed' ).style.display = collapse ? '' : 'none' ;
         this._Document.getElementById( 'xExpanded' ).style.display = collapse ? 'none' : '' ;
 
-        if ( FCKBrowserInfo.IsGecko )
+        if ( window.onresize )
         {
                 // I had to use "setTimeout" because Gecko was not responding in a right
                 // way when calling window.onresize() directly.

editor/fckeditor.html

@@ -372 +372 @@
         }
 }
 
-// Gecko browsers doesn't calculate well the IFRAME size so we must
+// Gecko and Webkit browsers don't calculate well the IFRAME size so we must
 // recalculate it every time the window size changes.
-if ( FCKBrowserInfo.IsGecko && !FCKBrowserInfo.IsOpera )
+if ( FCKBrowserInfo.IsGecko || FCKBrowserInfo.IsSafari )
 {
         window.onresize = function( e )
         {
-                // Running in Chrome makes the window receive the event including subframes.
+                // Running in Firefox's chrome makes the window receive the event including subframes.
                 // we care only about this window. Ticket #1642.
                 // #2002: The originalTarget from the event can be the current document, the window, or the editing area.
-                if ( e && e.originalTarget !== document && e.originalTarget !== window && (!e.originalTarget.ownerDocument || e.originalTarget.ownerDocument != document ))
+                if ( e && e.originalTarget && e.originalTarget !== document && e.originalTarget !== window && (!e.originalTarget.ownerDocument || e.originalTarget.ownerDocument != document ))
                         return ;
 
                 var oCell = document.getElementById( 'xEditingArea' ) ;