Project

General

Profile

« Previous | Next » 

Revision 1289

Added by kweitzel over 14 years ago

Branch 2.8.1 merged back into Trunk

View differences:

fckeditor.original.html
202 202
LoadScript( '_source/classes/fcktoolbarfontscombo.js' ) ;
203 203
LoadScript( '_source/classes/fcktoolbarfontsizecombo.js' ) ;
204 204
LoadScript( '_source/classes/fcktoolbarpanelbutton.js' ) ;
205
LoadScript( '_source/internals/fckscayt.js' ) ;
205 206
LoadScript( '_source/internals/fcktoolbaritems.js' ) ;
206 207
LoadScript( '_source/classes/fcktoolbar.js' ) ;
207 208
LoadScript( '_source/classes/fcktoolbarbreak_' + sSuffix + '.js' ) ;
......
372 373
	}
373 374
}
374 375

  
375
// Gecko browsers doesn't calculate well the IFRAME size so we must
376
// Gecko and Webkit browsers don't calculate well the IFRAME size so we must
376 377
// recalculate it every time the window size changes.
377
if ( FCKBrowserInfo.IsGecko && !FCKBrowserInfo.IsOpera )
378
if ( FCKBrowserInfo.IsGecko || FCKBrowserInfo.IsSafari )
378 379
{
379 380
	window.onresize = function( e )
380 381
	{
381
		// Running in Chrome makes the window receive the event including subframes.
382
		// Running in Firefox's chrome makes the window receive the event including subframes.
382 383
		// we care only about this window. Ticket #1642.
383 384
		// #2002: The originalTarget from the event can be the current document, the window, or the editing area.
384
		if ( e && e.originalTarget !== document && e.originalTarget !== window && (!e.originalTarget.ownerDocument || e.originalTarget.ownerDocument != document ))
385
		if ( e && e.originalTarget && e.originalTarget !== document && e.originalTarget !== window && (!e.originalTarget.ownerDocument || e.originalTarget.ownerDocument != document ))
385 386
			return ;
386 387

  
387 388
		var oCell = document.getElementById( 'xEditingArea' ) ;

Also available in: Unified diff