Index: editor/_source/classes/fckeditingarea.js
===================================================================
--- editor/_source/classes/fckeditingarea.js (revision 1932)
+++ editor/_source/classes/fckeditingarea.js (working copy)
@@ -97,7 +97,7 @@
var sOverrideError = '' ;
oIFrame.frameBorder = 0 ;
- oIFrame.width = oIFrame.height = '100%' ;
+ oIFrame.style.width = oIFrame.style.height = '100%' ;
if ( FCK_IS_CUSTOM_DOMAIN && FCKBrowserInfo.IsIE )
{
Index: editor/_source/classes/fckpanel.js
===================================================================
--- editor/_source/classes/fckpanel.js (revision 1932)
+++ editor/_source/classes/fckpanel.js (working copy)
@@ -66,11 +66,12 @@
else
{
var oIFrame = this._IFrame = this._Window.document.createElement('iframe') ;
+ FCKTools.ResetStyles( oIFrame );
oIFrame.src = 'javascript:void(0)' ;
oIFrame.allowTransparency = true ;
oIFrame.frameBorder = '0' ;
oIFrame.scrolling = 'no' ;
- oIFrame.width = oIFrame.height = 0 ;
+ oIFrame.style.width = oIFrame.style.height = '0px' ;
FCKDomTools.SetElementStyles( oIFrame,
{
position : 'absolute',
@@ -279,8 +280,8 @@
{
var iWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ;
var iHeight = eMainNode.offsetHeight ;
- me._IFrame.width = iWidth ;
- me._IFrame.height = iHeight ;
+ me._IFrame.style.width = iWidth + 'px' ;
+ me._IFrame.style.height = iHeight + 'px' ;
}, 0 ) ;
@@ -305,7 +306,7 @@
// It is better to set the sizes to 0, otherwise Firefox would have
// rendering problems.
- this._IFrame.width = this._IFrame.height = 0 ;
+ this._IFrame.style.width = this._IFrame.style.height = '0px' ;
this._IsOpened = false ;
Index: editor/_source/internals/fckdialog.js
===================================================================
--- editor/_source/internals/fckdialog.js (revision 1932)
+++ editor/_source/internals/fckdialog.js (working copy)
@@ -75,15 +75,6 @@
} ) ;
}
- var resetStyles = function( element )
- {
- element.style.cssText = 'margin:0;' +
- 'padding:0;' +
- 'border:0;' +
- 'background-color:transparent;' +
- 'background-image:none;' ;
- }
-
return {
/**
* Opens a dialog window using the standard dialog template.
@@ -113,7 +104,7 @@
// Setup the IFRAME that will hold the dialog.
var dialog = topDocument.createElement( 'iframe' ) ;
- resetStyles( dialog ) ;
+ FCKTools.ResetStyles( dialog ) ;
dialog.src = FCKConfig.BasePath + 'fckdialog.html' ;
// Dummy URL for testing whether the code in fckdialog.js alone leaks memory.
@@ -179,7 +170,7 @@
{
// Setup the DIV that will be used to cover.
cover = topDocument.createElement( 'div' ) ;
- resetStyles( cover ) ;
+ FCKTools.ResetStyles( cover ) ;
FCKDomTools.SetElementStyles( cover,
{
'position' : 'absolute',
@@ -195,7 +186,7 @@
if ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 )
{
var iframe = topDocument.createElement( 'iframe' ) ;
- resetStyles( iframe ) ;
+ FCKTools.ResetStyles( iframe ) ;
iframe.hideFocus = true ;
iframe.frameBorder = 0 ;
iframe.src = FCKTools.GetVoidUrl() ;
Index: editor/_source/internals/fcktools.js
===================================================================
--- editor/_source/internals/fcktools.js (revision 1932)
+++ editor/_source/internals/fcktools.js (working copy)
@@ -738,3 +738,12 @@
return "javascript: void(0);" ; // All other browsers.
}
+
+FCKTools.ResetStyles = function( element )
+{
+ element.style.cssText = 'margin:0;' +
+ 'padding:0;' +
+ 'border:0;' +
+ 'background-color:transparent;' +
+ 'background-image:none;' ;
+}
Index: fckeditor.js
===================================================================
--- fckeditor.js (revision 1932)
+++ fckeditor.js (working copy)
@@ -160,7 +160,10 @@
var sLink = this.BasePath + 'editor/' + sFile + '?InstanceName=' + encodeURIComponent( this.InstanceName ) ;
if (this.ToolbarSet) sLink += '&Toolbar=' + this.ToolbarSet ;
- return '' ;
+ /^[0-9]+$/.test( this.Width ) && ( this.Width += 'px' ) ;
+ /^[0-9]+$/.test( this.Height ) && ( this.Height += 'px' ) ;
+ return '' ;
}
FCKeditor.prototype._IsCompatibleBrowser = function()