Changeset 1950

Timestamp:

2008-05-05 04:55:34 (3 months ago)

Author:

martinkou

Message:

Fixed #1633 : External styles should no longer interfere with the appearance of the editor and floating panels now.

Location:

FCKeditor/trunk

Files:

• editor/_source/classes/fckeditingarea.js (modified) (1 diff)
• editor/_source/classes/fckpanel.js (modified) (3 diffs)
• editor/_source/internals/fckdialog.js (modified) (4 diffs)
• editor/_source/internals/fck.js (modified) (1 diff)
• editor/_source/internals/fcktools.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/classes/fckeditingarea.js

@@ -98 +98 @@
 
                 oIFrame.frameBorder = 0 ;
-                oIFrame.width = oIFrame.height = '100%' ;
+                oIFrame.style.width = oIFrame.style.height = '100%' ;
 
                 if ( FCK_IS_CUSTOM_DOMAIN && FCKBrowserInfo.IsIE )

FCKeditor/trunk/editor/_source/classes/fckpanel.js

@@ -67 +67 @@
         {
                 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,
                         {
@@ -280 +281 @@
                                 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 ) ;
@@ -306 +307 @@
                 // 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 ;

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

@@ -76 +76 @@
         }
 
-        var resetStyles = function( element )
-        {
-                element.style.cssText = 'margin:0;' +
-                        'padding:0;' +
-                        'border:0;' +
-                        'background-color:transparent;' +
-                        'background-image:none;' ;
-        }
-
         return {
                 /**
@@ -114 +105 @@
                         // Setup the IFRAME that will hold the dialog.
                         var dialog = topDocument.createElement( 'iframe' ) ;
-                        resetStyles( dialog ) ;
+                        FCKTools.ResetStyles( dialog ) ;
                         dialog.src = FCKConfig.BasePath + 'fckdialog.html' ;
 
@@ -180 +171 @@
                         // Setup the DIV that will be used to cover.
                         cover = topDocument.createElement( 'div' ) ;
-                        resetStyles( cover ) ;
+                        FCKTools.ResetStyles( cover ) ;
                         FCKDomTools.SetElementStyles( cover,
                                 {
@@ -196 +187 @@
                         {
                                 var iframe = topDocument.createElement( 'iframe' ) ;
-                                resetStyles( iframe ) ;
+                                FCKTools.ResetStyles( iframe ) ;
                                 iframe.hideFocus = true ;
                                 iframe.frameBorder = 0 ;

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

@@ -1176 +1176 @@
         }
 }
+
+/*
+ * #1633 : Protect the editor iframe from external styles.
+ * Notice that we can't use FCKTools.ResetStyles here since FCKTools isn't
+ * loaded yet.
+ */
+(function()
+{
+        var el = window.frameElement ;
+        var width = el.width ;
+        var height = el.height ;
+        if ( /^\d+$/.test( width ) ) width += 'px' ;
+        if ( /^\d+$/.test( height ) ) height += 'px' ;
+        var style = el.style ;
+        style.border = style.padding = style.margin = 0 ;
+        style.backgroundColor = 'transparent';
+        style.backgroundImage = 'none';
+        style.width = width ;
+        style.height = height ;
+})() ;

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

@@ -739 +739 @@
         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/trunk/_whatsnew.html

@@ -63 +63 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2136">#2136</a>] Fixed JavaScript error in IE 
                         when opening the bullet list properties dialog.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1633">#1633</a>] External styles should no
+                        longer interfere with the appearance of the editor and floating panels now.</li>
         </ul>
         <h3>