Changeset 4223

Timestamp:

2009-09-11 18:26:00 (2 years ago)

Author:

alfonsoml

Message:

#3053 Fix sizing problems in Webkit

Location:

FCKeditor/trunk

Files:

• _whatsnew.html (modified) (1 diff)
• editor/_source/internals/fck.js (modified) (1 diff)
• editor/_source/internals/fcktoolbarset.js (modified) (1 diff)
• editor/fckeditor.html (modified) (1 diff)

FCKeditor/trunk/_whatsnew.html

@@ -97 +97 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2201">#2201</a>] Fixed a crash in IE 
                         in an object is selected (with handles) on unload of the editor.</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>

FCKeditor/trunk/editor/_source/internals/fck.js

@@ -495 +495 @@
                 }
 
-                if ( FCKBrowserInfo.IsGecko )
+                if ( window.onresize )
                         window.onresize() ;
         },

FCKeditor/trunk/editor/_source/internals/fcktoolbarset.js

@@ -240 +240 @@
         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

FCKeditor/trunk/editor/fckeditor.html

@@ -373 +373 @@
 }
 
-// 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 ;