Ticket #1865: 1865_4.patch

fcktablehandler.js

@@ -382 +382 @@
 
         this._ReplaceCellsByMarker( tableMap, '_SelectedCells', refCell ) ;
         this._UnmarkCells( cells, '_SelectedCells' ) ;
-        this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+        this._InstallTableMap( tableMap, refCell.parentNode.parentNode.parentNode ) ;
         refCell.appendChild( cellContents ) ;
 
         if ( FCKBrowserInfo.IsGeckoLike && ( ! refCell.firstChild ) )
@@ -408 +408 @@
         refCell.appendChild( cellContents ) ;
         this._MarkCells( [nextCell], '_Replace' ) ;
         this._ReplaceCellsByMarker( tableMap, '_Replace', refCell ) ;
-        this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+        this._InstallTableMap( tableMap, refCell.parentNode.parentNode.parentNode ) ;
 
         this._MoveCaretToCell( refCell, false ) ;
 }
@@ -430 +430 @@
         refCell.appendChild( cellContents ) ;
         this._MarkCells( [nextCell], '_Replace' ) ;
         this._ReplaceCellsByMarker( tableMap, '_Replace', refCell ) ;
-        this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+        this._InstallTableMap( tableMap, refCell.parentNode.parentNode.parentNode ) ;
 
         this._MoveCaretToCell( refCell, false ) ;
 }
@@ -496 +496 @@
                 tableMap = newTableMap ;
         }
 
-        this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+        this._InstallTableMap( tableMap, refCell.parentNode.parentNode.parentNode ) ;
 }
 
 FCKTableHandler.VerticalSplitCell = function()
@@ -540 +540 @@
                         newCell.colSpan = currentColSpan ;
                 if ( FCKBrowserInfo.IsGeckoLike )
                         FCKTools.AppendBogusBr( newCell ) ;
-                currentCell.parentNode.parentNode.rows[newCellRowIndex].insertBefore( newCell, insertMarker ) ;
+                currentCell.parentNode.parentNode.parentNode.rows[newCellRowIndex].insertBefore( newCell, insertMarker ) ;
         }
         else
         {
                 // 1. Insert a new row.
                 var newCellRowIndex = currentRowIndex + 1 ;
                 var newRow = FCK.EditorDocument.createElement( 'tr' ) ;
-                var tBody = currentCell.parentNode.parentNode ;
-                if ( tBody.rows.length > newCellRowIndex )
-                        tBody.insertBefore( newRow, tBody.rows[newCellRowIndex] ) ;
+                var oTable = FCKTools.GetElementAscensor( currentCell, 'TABLE' ) ;
+
+                if( oTable.tHead )
+                {
+                        var theadRows = oTable.tHead.rows.length ;
+
+                        if ( currentCell.parentNode.parentNode.tagName == 'TBODY' && currentCell.parentNode.parentNode.rows.length  <= newCellRowIndex - theadRows )
+                                currentCell.parentNode.parentNode.appendChild(newRow) ;
+                        else if ( currentCell.parentNode.parentNode.tagName == 'THEAD' && currentCell.parentNode.parentNode.rows.length  <= newCellRowIndex )
+                                currentCell.parentNode.parentNode.appendChild(newRow) ;
+                        else if( currentCell.parentNode.parentNode.tagName == 'TBODY' )
+                                currentCell.parentNode.parentNode.insertBefore( newRow, currentCell.parentNode.parentNode.rows[newCellRowIndex - theadRows] ) ;
+                        else
+                                currentCell.parentNode.parentNode.insertBefore( newRow, currentCell.parentNode.parentNode.rows[newCellRowIndex] ) ;
+                }
                 else
-                        tBody.appendChild( newRow ) ;
+                {
+                        if( currentCell.parentNode.parentNode.rows.length  <= newCellRowIndex)
+                                currentCell.parentNode.parentNode.appendChild(newRow) ;
+                        else
+                                currentCell.parentNode.parentNode.insertBefore( newRow, currentCell.parentNode.parentNode.rows[newCellRowIndex] ) ;
+                }
 
                 // 2. +1 to rowSpan for all cells crossing currentCell's row.
                 for ( var i = 0 ; i < tableMap[currentRowIndex].length ; )
@@ -615 +632 @@
 // The difference here is that the "spanned" cells (colSpan and rowSpan) are duplicated on the matrix
 // cells that are "spanned". For example, a row with 3 cells where the second cell has colSpan=2 and rowSpan=3
 // will produce a bi-dimensional matrix with the following values (representing the cells):
-//              Cell1, Cell2, Cell2, Cell2, Cell 3
-//              Cell4, Cell2, Cell2, Cell2, Cell 5
+//              Cell1, Cell2, Cell2, Cell3
+//              Cell4, Cell2, Cell2, Cell5
+//              Cell6, Cell2, Cell2, Cell7
 FCKTableHandler._CreateTableMap = function( refCell )
 {
-        // It's really a tbody, thead or tfoot. This is only temporary.
-        var table = (refCell.nodeName == 'TABLE' ? refCell : refCell.parentNode.parentNode ) ;
+        var table = (refCell.nodeName == 'TABLE' ? refCell : refCell.parentNode.parentNode.parentNode ) ;
 
         var aRows = table.rows ;
 
@@ -673 +690 @@
         // for storing the calculated rowSpan in IE.
         var rowSpanAttr = FCKBrowserInfo.IsIE ? "_fckrowspan" : "rowSpan" ;
 
-        // Clear the table of all rows first.
-        while ( table.rows.length > 0 )
-        {
-                var row = table.rows[0] ;
-                row.parentNode.removeChild( row ) ;
-        }
-
         // 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++ )
         {
@@ -764 +774 @@
                         if ( cell.rowSpan == 1 )
                                 cell.removeAttribute( 'rowspan' ) ;
                 }
-                table.appendChild( rowObj ) ;
+                if ( FCKBrowserInfo.IsIE )
+                {
+                        table.rows[i].replaceNode( rowObj ) ;
+                }
+                else
+                {
+                        table.rows[i].innerHTML = '' ;
+                        FCKDomTools.MoveChildren( rowObj, table.rows[i] ) ;
+                }
         }
 }