Changeset 1603

Timestamp:

2008-02-24 16:56:16 (6 months ago)

Author:

alfonsoml

Message:

Remove extra attributes when the RemoveFormat is executed #1502

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fckconfig.js (modified) (1 diff)
• editor/_source/internals/fckdomtools.js (modified) (1 diff)
• editor/_source/internals/fckstyles.js (modified) (1 diff)
• fckconfig.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

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

@@ -136 +136 @@
         if ( !sComboPreviewCSS || sComboPreviewCSS.length == 0 )
                 oConfig.ToolbarComboPreviewCSS = oConfig.EditorAreaCSS ;
+
+        // Turn the attributes that will be removed in the RemoveFormat from a string to an array
+        oConfig.RemoveAttributesArray = (oConfig.RemoveAttributes || '').split( ',' );
 }
 

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

@@ -517 +517 @@
                 return element.removeAttribute( attributeName, 0 ) ;
         },
+
+        /**
+         * Removes an array of attributes from an element
+         */
+        RemoveAttributes : function (element, aAttributes )
+        {
+                for ( var i = 0 ; i < aAttributes.length ; i++ )
+                        this.RemoveAttribute( element, aAttributes[i] );
+        }, 
 
         GetAttributeValue : function( element, att )

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

@@ -211 +211 @@
                         if ( tagsRegex.test( currentNode.nodeName ) )
                                 FCKDomTools.RemoveNode( currentNode, true ) ;
+                        else
+                                FCKDomTools.RemoveAttributes( currentNode, FCKConfig.RemoveAttributesArray );
 
                         currentNode = nextNode ;

FCKeditor/trunk/fckconfig.js

@@ -193 +193 @@
 FCKConfig.RemoveFormatTags = 'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var' ;
 
+// Attributes that will be removed 
+FCKConfig.RemoveAttributes = 'class,style,lang,width,height,align,hspace,valign' ;
+
 FCKConfig.CustomStyles =
 {

FCKeditor/trunk/_whatsnew.html

@@ -142 +142 @@
                         additional fifth parameter "customData" that will be send to the Execute method of the command for that 
                         menu item, allowing a single command to be used for different menu items..</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1502">#1502</a>] The RemoveFormat command now
+                        also removes the attributes from the cleaned text. The list of attributes is configurable with 
+                        FCKConfig.RemoveAttributes.</li>
         </ul>
         <p>