Ticket #2778: 2778.patch

fcktablehandler.js

@@ -673 +673 @@
         // for storing the calculated rowSpan in IE.
         var rowSpanAttr = FCKBrowserInfo.IsIE ? "_fckrowspan" : "rowSpan" ;
 
+        // Check for identical columns in tableMap,
+        // to remove them to get a proper colspan.
+        var doubleCol = new Array() ;
+        for ( var i = 0 ; i < tableMap.length ; i++ )
+        {
+                for ( var j = 0; j < tableMap[i].length ; j++ )
+                {
+                        // When doubleCol[j] == 0 the previous column is definitly not identical to the current one
+                        if( doubleCol[j] == 0 )
+                                continue ;
+                        else if ( tableMap[i][j-1] && tableMap[i][j-1] == tableMap[i][j] )
+                                doubleCol[j] = 1 ;
+                        else
+                                doubleCol[j] = 0 ;
+                }
+        }
+
+        // Build a temporary newTableMap.
+        var newTableMap = new Array() ;
+        for ( var i = 0 ; i < tableMap.length ; i++ )
+        {
+                var newRow = new Array() ;
+                for ( var j = 0; j < tableMap[i].length ; j++ )
+                {
+                        // Only insert the cell into newTableMap if the previous column is not identical to the current one.
+                        if( doubleCol[j] == 0 )
+                                newRow.push( tableMap[i][j] ) ;
+                }
+                newTableMap.push( newRow ) ;
+        }
+
+        // Replace tableMap with the temporary newTableMap.
+        tableMap = newTableMap ;
+
         // Disconnect all the cells in tableMap from their parents, set all colSpan and rowSpan attributes to 1.
         for ( var i = 0 ; i < tableMap.length ; i++ )
         {