Ticket #2813: 2813_2.patch

fcktablehandler.js

@@ -41 +41 @@
 
 FCKTableHandler.DeleteRows = function( row )
 {
-        // If no row has been passed as a parameter,
-        // then get the row( s ) containing the cells where the selection is placed in.
-        // If user selected multiple rows ( by selecting multiple cells ), walk
-        // the selected cell list and delete the rows containing the selected cells
-        if ( ! row )
-        {
-                var aCells = FCKTableHandler.GetSelectedCells() ;
-                var aRowsToDelete = new Array() ;
-                //queue up the rows -- it's possible ( and likely ) that we may get duplicates
-                for ( var i = 0; i < aCells.length; i++ )
-                {
-                        var oRow = aCells[i].parentNode ;
-                        aRowsToDelete[oRow.rowIndex] = oRow ;
-                }
-                for ( var i = aRowsToDelete.length; i >= 0; i-- )
-                {
-                        if ( aRowsToDelete[i] )
-                                FCKTableHandler.DeleteRows( aRowsToDelete[i] );
-                }
+        // Get all selected cells.
+        var cells = this.GetSelectedCells() ;
+        if ( cells.length < 1 )
                 return ;
-        }
 
-        // Get the row's table.
-        var oTable = FCKTools.GetElementAscensor( row, 'TABLE' ) ;
+        var oCell = cells[0] ;
+        var oTable = FCKTools.GetElementAscensor( oCell, 'TABLE' ) ;
+        var rowIdx = oCell.parentNode.rowIndex ;
+        var rowSpan = isNaN( oCell.rowSpan ) ? 1 : oCell.rowSpan ;
+        var tableMap = this._CreateTableMap( oCell ) ;
 
+        // Put the numbers of the row(s) to delete in an array.
+        var aRows = new Array() ;
+        for ( var i = 0; i < rowSpan; i++ )
+                aRows[i] = rowIdx + i ;
+
         // If just one row is available then delete the entire table.
         if ( oTable.rows.length == 1 )
         {
@@ -73 +64 @@
                 return ;
         }
 
-        // Delete the row.
-        row.parentNode.removeChild( row ) ;
+        // Delete the row(s).
+        for ( var i = aRows.length - 1; i >= 0; i-- )
+                oTable.rows[aRows[i]].parentNode.removeChild( oTable.rows[aRows[i]] ) ;
+
+        // Build newTableMap.
+        var newTableMap = new Array() ;
+        for ( var i = 0 ; i < tableMap.length ; i++ )
+        {
+                // Check if row has to be deleted.
+                var delRow = 0 ;
+                for ( var t = 0; t < aRows.length; t++ )
+                {
+                        if( i == aRows[t] )
+                                delRow = 1 ;
+                }
+
+                if( delRow == 0 )
+                {
+                        var newRow = new Array() ;
+                        for ( var j = 0; j < tableMap[i].length ; j++ )
+                                newRow.push( tableMap[i][j] ) ;
+
+                        newTableMap.push( newRow ) ;
+                }
+        }
+
+        this._InstallTableMap( newTableMap, oTable ) ;
 }
 
 FCKTableHandler.DeleteTable = function( table )