Ticket #2813: 2813_5.patch

editor/_source/internals/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 )
+        // Get a list of selected cells.
+        var 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] );
-                }
-                return ;
+                cells = this.GetSelectedCells() ;
+                if ( cells.length < 1 )
+                        return ;
         }
+        else
+                cells = [ row.cells[ 0 ] ] ;
 
-        // Get the row's table.
-        var oTable = FCKTools.GetElementAscensor( row, 'TABLE' ) ;
+        var database = {} ;
+        for ( var i = 0 ; i < cells.length ; i++ )
+                FCKDomTools.SetElementMarker( database, cells[ i ], '_fck_remove', true ) ;
 
-        // If just one row is available then delete the entire table.
-        if ( oTable.rows.length == 1 )
+        var table = FCKTools.GetElementAscensor( cells[ 0 ], 'table' ) ;
+
+        // Convert the current table to table map.
+        var tableMap = this._CreateTableMap( table ) ;
+        var processedTableMap = [] ;
+        
+        // Re-create the table map with selected rows removed.
+        for ( var i = 0 ; i < tableMap.length ; i++ )
         {
-                FCKTableHandler.DeleteTable( oTable ) ;
-                return ;
+                var currentRow = tableMap[ i ] ;
+                var removeCellFound = false ;
+                for ( var j = 0 ; j < currentRow.length ; j++ )
+                {
+                        if ( currentRow[ j ][ '_fck_remove' ] )
+                                removeCellFound = true ;
+                }
+
+                if ( !removeCellFound )
+                        processedTableMap.push( currentRow ) ;
         }
 
-        // Delete the row.
-        row.parentNode.removeChild( row ) ;
+        FCKDomTools.ClearAllMarkers( database ) ;
+        
+        // Install the table map, or delete the table if there're no rows left.
+        if ( processedTableMap.length > 0 )
+                this._InstallTableMap( processedTableMap, table ) ;
+        else
+                this.DeleteTable( table ) ;
 }
 
 FCKTableHandler.DeleteTable = function( table )
@@ -627 +636 @@
 //              Cell6, Cell2, Cell2, Cell7
 FCKTableHandler._CreateTableMap = function( refCell )
 {
-        var table = (refCell.nodeName == 'TABLE' ? refCell : refCell.parentNode.parentNode.parentNode ) ;
+        var table = ( refCell.nodeName == 'TABLE' ? refCell : FCKTools.GetElementAscensor( refCell, 'table' ) ) ;
 
         var aRows = table.rows ;
 
         // Row and Column counters.
         var r = -1 ;
 
-        var aMap = new Array() ;
+        var aMap = [] ;
 
         for ( var i = 0 ; i < aRows.length ; i++ )
         {
                 r++ ;
                 if ( !aMap[r] )
-                        aMap[r] = new Array() ;
+                        aMap[r] = [] ;
 
                 var c = -1 ;
 
@@ -658 +667 @@
                         for ( var rs = 0 ; rs < iRowSpan ; rs++ )
                         {
                                 if ( !aMap[r + rs] )
-                                        aMap[r + rs] = new Array() ;
+                                        aMap[r + rs] = [] ;
 
                                 for ( var cs = 0 ; cs < iColSpan ; cs++ )
                                 {
@@ -680 +689 @@
         // for storing the calculated rowSpan in IE.
         var rowSpanAttr = FCKBrowserInfo.IsIE ? "_fckrowspan" : "rowSpan" ;
 
-        // 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++ )
+        // Disconnect all the cells in the table from their parents, set all colSpan and rowSpan attributes to 1.
+        for ( var i = 0 ; i < table.rows.length ; i++ )
         {
-                for ( var j = 0 ; j < tableMap[i].length ; j++ )
+                var currentRow = table.rows[ i ];
+                for ( var j = currentRow.cells.length - 1 ; j >= 0 ; j-- )
                 {
-                        var cell = tableMap[i][j] ;
-                        if ( cell.parentNode )
-                                cell.parentNode.removeChild( cell ) ;
+                        var cell = currentRow.cells[ j ] ;
+                        cell.parentNode.removeChild( cell ) ;
                         cell.colSpan = cell[rowSpanAttr] = 1 ;
                 }
         }
@@ -735 +744 @@
                 for ( var j = 0 ; j < tableMap[i].length ; j++)
                 {
                         var cell = tableMap[i][j] ;
-                        FCKDomTools.ClearElementJSProperty(cell, '_colScanned' ) ;
-                        FCKDomTools.ClearElementJSProperty(cell, '_rowScanned' ) ;
+                        FCKDomTools.ClearElementJSProperty( cell, '_colScanned' ) ;
+                        FCKDomTools.ClearElementJSProperty( cell, '_rowScanned' ) ;
                 }
         }
 
@@ -760 +769 @@
                         }
                         j += cell.colSpan ;
                         if ( cell.colSpan == 1 )
-                                cell.removeAttribute( 'colspan' ) ;
+                                cell.removeAttribute( 'colSpan' ) ;
                         if ( cell.rowSpan == 1 )
-                                cell.removeAttribute( 'rowspan' ) ;
+                                cell.removeAttribute( 'rowSpan' ) ;
                 }
                 if ( FCKBrowserInfo.IsIE )
                 {
@@ -774 +783 @@
                         FCKDomTools.MoveChildren( rowObj, table.rows[i] ) ;
                 }
         }
+
+        // Remove excess rows.
+        for ( var i = table.rows.length - 1 ; i >= tableMap.length ; i-- )
+        {
+                var row = table.rows[ i ] ;
+                var rowParent = row.parentNode ;
+
+                rowParent.removeChild( row ) ;
+                if ( rowParent.rows.length < 1 )
+                        rowParent.parentNode.removeChild( rowParent ) ;
+        }
 }
 
 FCKTableHandler._MoveCaretToCell = function ( refCell, toStart )

editor/_source/internals/fckdomtools.js

@@ -722 +722 @@
                         delete element[attrName] ;
         },
 
-        SetElementMarker : function ( markerObj, element, attrName, value)
+        SetElementMarker : function ( markerObj, element, attrName, value )
         {
                 var id = String( parseInt( Math.random() * 0xffffffff, 10 ) ) ;
                 element._FCKMarkerId = id ;

_whatsnew.html

@@ -79 +79 @@
                         of caption tag in tables with table headers.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3818">#3818</a>] Fixed layout error
                         in text and background color popups when more colors button is disabled.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2813">#2813</a>] Deleting a row
+                        does not correct the rowSpan of merged cells.</li>
         </ul>
         <p>
                 <a href="_whatsnew_history.html">See previous versions history</a></p>