Changeset 927

Timestamp:

2007-10-01 11:27:58 (14 months ago)

Author:

fredck

Message:

Fixed #1318 : The "class" attribute is now treated differently. It is now used to identify different elements, in combination with the element name (similar element = A.nodeName == B.nodeName && A.className == B.className).

Files:

• FCKeditor/trunk/editor/_source/classes/fckstyle.js (modified) (4 diffs)

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

@@ -183 +183 @@
                                 if ( this.CheckElementRemovable( pathElement ) )
                                 {
-                                        if ( isBoundary 
-                                                && !FCKDomTools.CheckIsEmptyElement( pathElement, 
-                                                                function( el ) 
-                                                                { 
-                                                                        return ( el != bookmarkStart ) ; 
-                                                                } ) 
+                                        if ( isBoundary
+                                                && !FCKDomTools.CheckIsEmptyElement( pathElement,
+                                                                function( el )
+                                                                {
+                                                                        return ( el != bookmarkStart ) ;
+                                                                } )
                                                 )
                                         {
                                                 lastBoundaryElement = pathElement ;
-                                                
+
                                                 // We'll be continuously including elements in the
                                                 // boundaryElements array, but only those added before
@@ -211 +211 @@
                                                                 if ( FCKDomTools.HasAttribute( pathElement, att ) )
                                                                 {
-                                                                        if ( att == 'style' )
-                                                                                this._RemoveStylesFromElement( pathElement ) ;
-                                                                        else
-                                                                                FCKDomTools.RemoveAttribute( pathElement, att ) ;
+                                                                        switch ( att )
+                                                                        {
+                                                                                case 'style' :
+                                                                                        this._RemoveStylesFromElement( pathElement ) ;
+                                                                                        break ;
+
+                                                                                case 'class' :
+                                                                                        // The 'class' element value must match (#1318).
+                                                                                        if ( FCKDomTools.GetAttributeValue( pathElement, att ) != this.GetFinalAttributeValue( att ) )
+                                                                                                continue ;
+
+                                                                                default :
+                                                                                        FCKDomTools.RemoveAttribute( pathElement, att ) ;
+                                                                        }
                                                                 }
                                                         }
@@ -349 +359 @@
                                                 if ( FCKDomTools.HasAttribute( currentNode, att ) )
                                                 {
-                                                        if ( att == 'style' )
-                                                                this._RemoveStylesFromElement( currentNode ) ;
-                                                        else
-                                                                FCKDomTools.RemoveAttribute( currentNode, att ) ;
+                                                        switch ( att )
+                                                        {
+                                                                case 'style' :
+                                                                        this._RemoveStylesFromElement( currentNode ) ;
+                                                                        break ;
+
+                                                                case 'class' :
+                                                                        // The 'class' element value must match (#1318).
+                                                                        if ( FCKDomTools.GetAttributeValue( currentNode, att ) != this.GetFinalAttributeValue( att ) )
+                                                                                continue ;
+
+                                                                default :
+                                                                        FCKDomTools.RemoveAttribute( currentNode, att ) ;
+                                                        }
                                                 }
                                         }
@@ -509 +529 @@
                                 if ( FCKDomTools.HasAttribute( innerElement, att ) )
                                 {
-                                        if ( att == 'style' )
-                                                this._RemoveStylesFromElement( innerElement ) ;
-                                        else
-                                                FCKDomTools.RemoveAttribute( innerElement, att ) ;
+                                        switch ( att )
+                                        {
+                                                case 'style' :
+                                                        this._RemoveStylesFromElement( innerElement ) ;
+                                                        break ;
+
+                                                case 'class' :
+                                                        // The 'class' element value must match (#1318).
+                                                        if ( FCKDomTools.GetAttributeValue( innerElement, att ) != this.GetFinalAttributeValue( att ) )
+                                                                continue ;
+
+                                                default :
+                                                        FCKDomTools.RemoveAttribute( innerElement, att ) ;
+                                        }
                                 }
                         }