Ticket #1502: 1502_2.patch

_whatsnew.html

@@ -138 +138 @@
                         resolved issues with OnRequestEnd.cfm breaking the file browser.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1509">#1509</a>] InsertHtml() in IE will no
                         longer turn the preceding normal whitespace into &amp;nbsp;.</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>
                 <a href="_whatsnew_history.html">See previous versions history</a>

editor/_source/internals/fckconfig.js

@@ -135 +135 @@
         var sComboPreviewCSS = oConfig.ToolbarComboPreviewCSS ;
         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( ',' );
 }
 
 // Define toolbar sets collection.

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 )
         {
                 var attName = att ;

editor/_source/internals/fckstyles.js

@@ -210 +210 @@
                         // Remove elements nodes that match with this style rules.
                         if ( tagsRegex.test( currentNode.nodeName ) )
                                 FCKDomTools.RemoveNode( currentNode, true ) ;
+                        else
+                                FCKDomTools.RemoveAttributes( currentNode, FCKConfig.RemoveAttributesArray );
 
                         currentNode = nextNode ;
                 }

fckconfig.js

@@ -192 +192 @@
 // Only inline elements are valid.
 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 =
 {
         'Red Title'     : { Element : 'h3', Styles : { 'color' : 'Red' } }