Ticket #1633: 1633_pre.patch

editor/_source/classes/fckeditingarea.js

@@ -97 +97 @@
                 var sOverrideError = '<script type="text/javascript" _fcktemp="true">window.onerror=function(){return true;};</script>' ;
 
                 oIFrame.frameBorder = 0 ;
-                oIFrame.width = oIFrame.height = '100%' ;
+                oIFrame.style.width = oIFrame.style.height = '100%' ;
 
                 if ( FCK_IS_CUSTOM_DOMAIN && FCKBrowserInfo.IsIE )
                 {

editor/_source/classes/fckpanel.js

@@ -66 +66 @@
         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 +280 @@
                         {
                                 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 +306 @@
 
                 // 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 ;
 

editor/_source/internals/fckdialog.js

@@ -75 +75 @@
                         } ) ;
         }
 
-        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 +104 @@
 
                         // 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 +170 @@
                 {
                         // Setup the DIV that will be used to cover.
                         cover = topDocument.createElement( 'div' ) ;
-                        resetStyles( cover ) ;
+                        FCKTools.ResetStyles( cover ) ;
                         FCKDomTools.SetElementStyles( cover,
                                 {
                                         'position' : 'absolute',
@@ -195 +186 @@
                         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() ;

editor/_source/internals/fcktools.js

@@ -738 +738 @@
 
         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;' ;
+}

fckeditor.js

@@ -160 +160 @@
         var sLink = this.BasePath + 'editor/' + sFile + '?InstanceName=' + encodeURIComponent( this.InstanceName ) ;
         if (this.ToolbarSet) sLink += '&Toolbar=' + this.ToolbarSet ;
 
-        return '<iframe id="' + this.InstanceName + '___Frame" src="' + sLink + '" width="' + this.Width + '" height="' + this.Height + '" frameborder="0" scrolling="no"></iframe>' ;
+        /^[0-9]+$/.test( this.Width ) && ( this.Width += 'px' ) ;
+        /^[0-9]+$/.test( this.Height ) && ( this.Height += 'px' ) ;
+        return '<iframe id="' + this.InstanceName + '___Frame" src="' + sLink + '" style="width:' + this.Width + '; height:' + this.Height + '\
+                ;border: 0; padding: 0; margin: 0;" frameborder="0" scrolling="no"></iframe>' ;
 }
 
 FCKeditor.prototype._IsCompatibleBrowser = function()