Changeset 1010

Timestamp:

10/10/07 15:18:41 (6 years ago)

Author:

fredck

Message:

Fixed #1391 : Overrides for the "class" attribute was improperly handled in IE.

Location:

FCKeditor/trunk/editor/_source

Files:

• classes/fckstyle.js (modified) (2 diffs)
• internals/fckdomtools.js (modified) (2 diffs)

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

@@ -468 +468 @@
                                         //      has matches in the attribute value.
                                         if ( attValue == null ||
-                                                        ( typeof attValue == 'string' && element.getAttribute( attName, 2 ) == attValue ) ||
-                                                        attValue.test( element.getAttribute( attName, 2 ) ) )
+                                                        ( typeof attValue == 'string' && FCKDomTools.GetAttributeValue( element, attName ) == attValue ) ||
+                                                        attValue.test( FCKDomTools.GetAttributeValue( element, attName ) ) )
                                                 return true ;
                                 }
@@ -618 +618 @@
                                         //      has matches in the attribute value.
                                         if ( attValue == null ||
-                                                        ( attValue.test && attValue.test( element.getAttribute( attName, 2 ) ) ) ||
-                                                        ( typeof attValue == 'string' && element.getAttribute( attName, 2 ) == attValue ) )
+                                                        ( attValue.test && attValue.test( FCKDomTools.GetAttributeValue( element, attName ) ) ) ||
+                                                        ( typeof attValue == 'string' && FCKDomTools.GetAttributeValue( element, attName ) == attValue ) )
                                                 FCKDomTools.RemoveAttribute( element, attName ) ;
                                 }

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

@@ -446 +446 @@
                 for ( var i = 0 ; i < attributes.length ; i++ )
                 {
-                        if ( attributes[i].specified )
+                        if ( FCKBrowserInfo.IsIE && attributes[i].nodeName == 'class' )
+                        {
+                                // IE has a strange bug. If calling removeAttribute('className'), 
+                                // the attributes collection will still contain the "class"
+                                // attribute, which will be marked as "specified", even if the
+                                // outerHTML of the element is not displaying the class attribute.
+                                // Note : I was not able to reproduce it outside the editor,
+                                // but I've faced it while working on the TC of #1391.
+                                if ( element.className.length > 0 )
+                                        return true ;
+                        }
+                        else if ( attributes[i].specified )
                                 return true ;
                 }
@@ -461 +472 @@
                         attributeName = 'className' ;
 
-                return element.removeAttribute( attributeName ) ;
-        },
-
+                return element.removeAttribute( attributeName, 0 ) ;
+        },
 
         GetAttributeValue : function( element, att )