Ticket #1642: 1642.patch
File 1642.patch, 2.6 KB (added by , 15 years ago) |
---|
-
_source/internals/fck_gecko.js
28 28 FCK.InitializeBehaviors = function() 29 29 { 30 30 // When calling "SetData", the editing area IFRAME gets a fixed height. So we must recalculate it. 31 if ( FCKBrowserInfo.IsGecko) // Not for Safari/Opera.32 Window_OnResize() ;31 if ( window.onresize ) // Not for Safari/Opera. 32 window.onresize() ; 33 33 34 34 FCKFocusManager.AddWindow( this.EditorWindow ) ; 35 35 -
fckdialog.html
179 179 oDiv.className = 'PopupTabSelected' ; 180 180 eTabsRow.style.display = '' ; 181 181 182 if ( ! window.dialogArguments.Editor.FCKBrowserInfo.IsIE)182 if ( window.onresize ) 183 183 window.onresize() ; 184 184 } 185 185 … … 256 256 } 257 257 DisableContextMenu( document ) ; 258 258 259 if ( ! window.dialogArguments.Editor.FCKBrowserInfo.IsIE)259 if ( window.dialogArguments.Editor.FCKBrowserInfo.IsGecko && !window.dialogArguments.Editor.FCKBrowserInfo.IsOpera ) 260 260 { 261 window.onresize = function( )261 window.onresize = function( e ) 262 262 { 263 // Running in Chrome makes the window receive the event including subframes. 264 // we care only about this window. Ticket #1642 265 if ( e && e.originalTarget !== document ) 266 return ; 267 263 268 var oFrame = document.getElementById("frmMain") ; 264 269 265 270 if ( ! oFrame ) 266 return ;271 return ; 267 272 268 273 oFrame.height = 0 ; 269 274 -
fckeditor.html
281 281 } 282 282 } 283 283 284 // Gecko browsers doe ns't calculate well thatIFRAME size so we must284 // Gecko browsers doesn't calculate well the IFRAME size so we must 285 285 // recalculate it every time the window size changes. 286 if ( FCKBrowserInfo.IsGecko )286 if ( FCKBrowserInfo.IsGecko && !FCKBrowserInfo.IsOpera ) 287 287 { 288 function Window_OnResize()288 window.onresize = function( e ) 289 289 { 290 if ( FCKBrowserInfo.IsOpera ) 290 // Running in Chrome makes the window receive the event including subframes. 291 // we care only about this window. Ticket #1642 292 if ( e && e.originalTarget !== document ) 291 293 return ; 292 294 293 295 var oCell = document.getElementById( 'xEditingArea' ) ; … … 299 301 eInnerElement.style.height = oCell.scrollHeight - 2 ; 300 302 } 301 303 } 302 window.onresize = Window_OnResize ;303 304 } 304 305 305 306 </script>