Ticket #2389: 2389.2.patch

fckdomtools.js

@@ -507 +507 @@
         },
 
         /**
+         * Copy all attributes of the element to an array.
+         * Fix is specific to ticket #2389 but could probably be used in other scenarios.
+         */
+        CopyAttributesToArray : function ( element )
+        {
+                var elementAttributes = {} ;
+                var oAttributes = element.attributes;
+                
+                for ( var i = 0 ; i < oAttributes.length ; i++ )
+                {
+                        // Check for "specified" attributes on the row element
+                        if( oAttributes.item(i).specified )
+                        {
+                                elementAttributes[oAttributes.item(i).nodeName] = this.GetAttributeValue( element, oAttributes.item(i).nodeName ) ;
+                        }
+                }
+                return elementAttributes ;
+        },
+
+        /**
+         * Generic function used to set attribute values of DOM elements.
+         */
+        SetAttributeValue : function( element, attributeName, attributeValue )
+        {
+                // Workaround for IE when setting the "style" or "class" attributes.
+                if ( FCKBrowserInfo.IsIE && attributeName == 'style' )
+                        element.style.cssText = attributeValue;
+                else if ( FCKBrowserInfo.IsIE && attributeName == 'class' )
+                        element.setAttribute( 'className', attributeValue ) ;
+                else
+                        element.setAttribute( attributeName, attributeValue ) ;
+        },
+        
+        /**
          * Remove an attribute from an element.
          */
         RemoveAttribute : function( element, attributeName )

fcktablehandler.js

@@ -685 +685 @@
         // as the cell is not attached to a row. So we'll need an alternative attribute
         // for storing the calculated rowSpan in IE.
         var rowSpanAttr = FCKBrowserInfo.IsIE ? "_fckrowspan" : "rowSpan" ;
-
+        
+        // Get all row attributes
+        var rowAttributes = [] ;
+        var rowCount = 0 ;
+        var skipRowAttributes = true ;
+        
         // Clear the table of all rows first.
         while ( table.rows.length > 0 )
         {
                 var row = table.rows[0] ;
+                
+                // Get all row attributes before deleting the row
+                if ( FCKDomTools.HasAttributes ( row ) )
+                {
+                        skipRowAttributes = false ;
+                        rowAttributes[rowCount] = FCKDomTools.CopyAttributesToArray ( row );
+                        rowCount++ ;
+                }
+                                
                 row.parentNode.removeChild( row ) ;
         }
 
@@ -765 +779 @@
         for ( var i = 0 ; i < tableMap.length ; i++ )
         {
                 var rowObj = FCKTools.GetElementDocument( table ).createElement( 'tr' ) ;
+                
+                if ( !skipRowAttributes )
+                {
+                        // Set attributes previously stored in the array
+                        var attributeList = rowAttributes[i];
+                        for ( var attributeName in attributeList )
+                        {
+                                FCKDomTools.SetAttributeValue( rowObj, attributeName , attributeList[attributeName] ) ;
+                        }
+                }
+                
                 for ( var j = 0 ; j < tableMap[i].length ; )
                 {
                         var cell = tableMap[i][j] ;