Changeset 568

Timestamp:

2007-07-27 03:32:41 (3 years ago)

Author:

martinkou

Message:

Fix for #581 : Fixed the issue where having a form input called "className" in the editor form would cause errors to the maximize feature.
Fix for #581 : Fixed the issue where having a form input called "style" in the editor document would cause errors to FCKXhtml.GetXHTML() calls.

Location:

FCKeditor/trunk/editor/_source

Files:

• commandclasses/fckfitwindow.js (modified) (1 diff)
• internals/fcktools_gecko.js (modified) (4 diffs)
• internals/fcktools_ie.js (modified) (3 diffs)
• internals/fcktools.js (modified) (1 diff)
• internals/fckxhtml_ie.js (modified) (1 diff)

FCKeditor/trunk/editor/_source/commandclasses/fckfitwindow.js

@@ -57 +57 @@
                         if ( eParent.nodeType == 1 )
                         {
-                                var hijackNode = null ;
-                                var hijackSibling = null ;
-                                if ( eParent.tagName.toLowerCase() == 'form' && eParent.elements.namedItem( 'style' ) )
-                                {
-                                        hijackNode = eParent.elements.namedItem( 'style' ) ;
-                                        hijackSibling = hijackNode.nextSibling ;
-                                        eParent.removeChild( hijackNode ) ;
-                                }
                                 eParent._fckSavedStyles = FCKTools.SaveStyles( eParent ) ;
                                 eParent.style.zIndex = FCKConfig.FloatingPanelsZIndex - 1 ;
-                                if ( hijackNode )
-                                {
-                                        if ( hijackSibling )
-                                                eParent.insertBefore( hijackNode, hijackSibling ) ;
-                                        else
-                                                eParent.appendChild( hijackNode ) ;
-                                }
                         }
                 }

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

@@ -153 +153 @@
 FCKTools.SaveStyles = function( element )
 {
+        var data = FCKTools.ProtectFormStyles( element ) ;
+
         var oSavedStyles = new Object() ;
 
@@ -169 +171 @@
         }
 
+        FCKTools.RestoreFormStyles( element, data ) ;
         return oSavedStyles ;
 }
@@ -174 +177 @@
 FCKTools.RestoreStyles = function( element, savedStyles )
 {
+        var data = FCKTools.ProtectFormStyles( element ) ;
         element.className = savedStyles.Class || '' ;
 
@@ -180 +184 @@
         else
                 element.removeAttribute( 'style', 0 ) ;
+        FCKTools.RestoreFormStyles( element, data ) ;
 }
 

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

@@ -182 +182 @@
 FCKTools.SaveStyles = function( element )
 {
+        var data = FCKTools.ProtectFormStyles( element ) ;
+
         var oSavedStyles = new Object() ;
 
@@ -198 +200 @@
         }
 
+        FCKTools.RestoreFormStyles( element, data ) ;
         return oSavedStyles ;
 }
@@ -203 +206 @@
 FCKTools.RestoreStyles = function( element, savedStyles )
 {
+        var data = FCKTools.ProtectFormStyles( element ) ;
         element.className               = savedStyles.Class || '' ;
         element.style.cssText   = savedStyles.Inline || '' ;
+        FCKTools.RestoreFormStyles( element, data ) ;
 }
 

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

@@ -474 +474 @@
         return pos ;
 }
+
+FCKTools.ProtectFormStyles = function( formNode )
+{
+        if ( !formNode || formNode.nodeType != 1 || formNode.tagName.toLowerCase() != 'form' )
+                return [] ;
+        var hijackRecord = [] ;
+        var hijackNames = [ 'style', 'className' ] ;
+        for ( var i = 0 ; i < hijackNames.length ; i++ )
+        {
+                var name = hijackNames[i] ;
+                if ( formNode.elements.namedItem( name ) )
+                {
+                        var hijackNode = formNode.elements.namedItem( name ) ;
+                        hijackRecord.push( [ hijackNode, hijackNode.nextSibling ] ) ;
+                        formNode.removeChild( hijackNode ) ;
+                }
+        }
+        return hijackRecord ;
+}
+
+FCKTools.RestoreFormStyles = function( formNode, hijackRecord )
+{
+        if ( !formNode || formNode.nodeType != 1 || formNode.tagName.toLowerCase() != 'form' )
+                return ;
+        if ( hijackRecord.length > 0 )
+        {
+                for ( var i = hijackRecord.length - 1 ; i >= 0 ; i-- )
+                {
+                        var node = hijackRecord[i][0] ;
+                        var sibling = hijackRecord[i][1] ;
+                        if ( sibling )
+                                formNode.insertBefore( node, sibling ) ;
+                        else
+                                formNode.appendChild( node ) ;
+                }
+        }
+}

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

@@ -47 +47 @@
                         // attribute. It returns "null" for the nodeValue.
                         else if ( sAttName == 'style' )
+                        {
+                                var data = FCKTools.ProtectFormStyles( htmlNode ) ;
                                 sAttValue = htmlNode.style.cssText.replace( FCKRegexLib.StyleProperties, FCKTools.ToLowerCase ) ;
+                                FCKTools.RestoreFormStyles( htmlNode, data ) ;
+                        }
                         // There are two cases when the oAttribute.nodeValue must be used:
                         //              - for the "class" attribute