Ticket #2800: 2800.patch

fcktablehandler.js

@@ -157 +157 @@
 
         if ( !oCell ) return ;
 
-        // Get the cell's table.
         var oTable = FCKTools.GetElementAscensor( oCell, 'TABLE' ) ;
+        var tableMap = this._CreateTableMap( oCell ) ;
+        var rowIdx = oCell.parentNode.rowIndex ;
+        var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, oCell ) ;
+        var colSpan = isNaN( oCell.colSpan ) ? 1 : oCell.colSpan ;
 
-        // Get the cell index.
-        var iIndex = oCell.cellIndex ;
+        // Put the columns to delete in an array.
+        var aColumns = new Array() ;
+        for ( var t = 0; t <= colSpan-t; t++ )
+                aColumns[t] = colIdx + t ;
 
-        // Loop throw all rows (from down to up, because it's possible that some
-        // rows will be deleted).
-        for ( var i = oTable.rows.length - 1 ; i >= 0 ; i-- )
+        // Build newTableMap.
+        var maxCol = 0 ;
+        var newTableMap = new Array() ;
+        for ( var i = 0 ; i < tableMap.length ; i++ )
         {
-                // Get the row.
-                var oRow = oTable.rows[i] ;
+                if ( j > maxCol )
+                        maxCol = j ;
 
-                // If the cell to be removed is the first one and the row has just one cell.
-                if ( iIndex == 0 && oRow.cells.length == 1 )
+                var newRow = new Array() ;
+                for ( var j = 0; j < tableMap[i].length ; j++ )
                 {
-                        // Remove the entire row.
-                        FCKTableHandler.DeleteRows( oRow ) ;
-                        continue ;
+                        // Check if the cell is in a column to be delete.
+                        var delCol = 0 ;
+                        for( var t = 0; t < aColumns.length; t++ )
+                        {
+                                if( j == aColumns[t] )
+                                        delCol = 1 ;
+                        }
+
+                        if( delCol == 0 )
+                                newRow.push( tableMap[i][j] ) ;
                 }
+                newTableMap.push( newRow ) ;
+        }
 
-                // If the cell to be removed exists the delete it.
-                if ( oRow.cells[iIndex] )
-                        oRow.removeChild( oRow.cells[iIndex] ) ;
-        }
+        // If the number of columns in the table is equal to the colspan of the selected cell than remove the table.
+        // Otherwise build the table.
+        if( maxCol == colSpan )
+                oTable.parentNode.removeChild ( oTable ) ;
+        else
+                this._InstallTableMap( newTableMap, oCell.parentNode.parentNode.parentNode ) ;
 }
 
 FCKTableHandler.InsertCell = function( cell, insertBefore )