Ticket #2389: 2389.patch

fckdomtools.js

@@ -1 @@
-/*
+/*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
@@ -525 +525 @@
                 for ( var i = 0 ; i < aAttributes.length ; i++ )
                         this.RemoveAttribute( element, aAttributes[i] );
         },
+        
+        /**
+         * 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 j = 0 ;
 
+                for ( var i = 0 ; i < element.attributes.length ; i++ )
+                {
+                        // Check for "specified" attributes on the row element
+                        if( element.attributes[i].specified )
+                        {
+                                elementAttributes[j] = element.attributes.item(i).nodeName ;
+                                elementAttributes[j + 1] = this.GetAttributeValue( element, element.attributes.item(i).nodeName ) ;
+                                j = j + 2 ;
+                        }
+                }
+                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 ) ;
+        },      
+
         GetAttributeValue : function( element, att )
         {
                 var attName = att ;

fcktablehandler.js

@@ -1 @@
-/*
+/*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
@@ -686 +686 @@
         // for storing the calculated rowSpan in IE.
         var rowSpanAttr = FCKBrowserInfo.IsIE ? "_fckrowspan" : "rowSpan" ;
 
+        // Get all row attributes
+        var rowAttributes = [] ;
+        var rowCount = 0 ;
+
         // 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
+                rowAttributes[rowCount] = FCKDomTools.CopyAttributesToArray ( row );
+                rowCount++ ;
+                
                 row.parentNode.removeChild( row ) ;
         }
 
@@ -765 +774 @@
         for ( var i = 0 ; i < tableMap.length ; i++ )
         {
                 var rowObj = FCKTools.GetElementDocument( table ).createElement( 'tr' ) ;
+
+                // Set attributes previously stored in the array
+                var rowAttributePairs = [] ;
+                rowAttributePairs = rowAttributes[i].toString().split(",");
+                
+                for ( var k = 0 ; k < rowAttributePairs.length ; k = k + 2 )
+                        FCKDomTools.SetAttributeValue( rowObj, rowAttributePairs[k] , rowAttributePairs[k + 1] ) ;
+                
                 for ( var j = 0 ; j < tableMap[i].length ; )
                 {
                         var cell = tableMap[i][j] ;