Ticket #1865: 1865_Koen.patch

editor/_source/internals/fcktablehandler.js

@@ -298 +298 @@
 
         this._MarkCells( cells, '_CellSelected' ) ;
 
-        var tableMap = this._CreateTableMap( cells[0].parentNode.parentNode ) ;
+        var tableMap = this._CreateTableMap( cells[0] ) ;
         var rowIdx = cells[0].parentNode.rowIndex ;
         var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, cells[0] ) ;
 
@@ -357 +357 @@
         // Assume the selected cells are already in a rectangular geometry.
         // Because the checking is already done by FCKTableCommand.
         var refCell = cells[0] ;
-        var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ;
+        var tableMap = this._CreateTableMap( refCell ) ;
         var rowIdx = refCell.parentNode.rowIndex ;
         var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
 
@@ -390 +390 @@
 
         this._ReplaceCellsByMarker( tableMap, '_SelectedCells', refCell ) ;
         this._UnmarkCells( cells, '_SelectedCells' ) ;
-        this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+        this._InstallTableMap( tableMap, refCell ) ;
         refCell.appendChild( cellContents ) ;
 
         if ( FCKBrowserInfo.IsGeckoLike && ( ! refCell.firstChild ) )
@@ -416 +416 @@
         refCell.appendChild( cellContents ) ;
         this._MarkCells( [nextCell], '_Replace' ) ;
         this._ReplaceCellsByMarker( tableMap, '_Replace', refCell ) ;
-        this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+        this._InstallTableMap( tableMap, refCell ) ;
 
         this._MoveCaretToCell( refCell, false ) ;
 }
@@ -438 +438 @@
         refCell.appendChild( cellContents ) ;
         this._MarkCells( [nextCell], '_Replace' ) ;
         this._ReplaceCellsByMarker( tableMap, '_Replace', refCell ) ;
-        this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+        this._InstallTableMap( tableMap, refCell ) ;
 
         this._MoveCaretToCell( refCell, false ) ;
 }
@@ -450 +450 @@
                 return ;
 
         var refCell = cells[0] ;
-        var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ;
+        var tableMap = this._CreateTableMap( refCell ) ;
         var rowIdx = refCell.parentNode.rowIndex ;
         var colIdx = FCKTableHandler._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
         var cellSpan = isNaN( refCell.colSpan ) ? 1 : refCell.colSpan ;
@@ -504 +504 @@
                 tableMap = newTableMap ;
         }
 
-        this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+        this._InstallTableMap( tableMap, refCell ) ;
 }
 
 FCKTableHandler.VerticalSplitCell = function()
@@ -514 +514 @@
                 return ;
 
         var currentCell = cells[0] ;
-        var tableMap = this._CreateTableMap( currentCell.parentNode.parentNode ) ;
+        var tableMap = this._CreateTableMap( currentCell ) ;
         var cellIndex = FCKTableHandler._GetCellIndexSpan( tableMap, currentCell.parentNode.rowIndex, currentCell ) ;
         var currentRowSpan = currentCell.rowSpan ;
         var currentRowIndex = currentCell.parentNode.rowIndex ;
@@ -543 +543 @@
                 newCell.rowSpan = Math.floor( currentRowSpan / 2 ) ;
                 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' ) ;
-                currentCell.parentNode.parentNode.insertBefore( newRow, currentCell.parentNode.parentNode.rows[newCellRowIndex] ) ;
 
+                var theadRows = currentCell.parentNode.parentNode.parentNode.firstChild.rows.length ;
+
+                // Does the table contains a thead?
+                if(currentCell.parentNode.parentNode.parentNode.tHead) {
+                        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 {
+                        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 ; )
                 {
@@ -629 +654 @@
 // will produce a bi-dimensional matrix with the following values (representing the cells):
 //              Cell1, Cell2, Cell2, Cell 3
 //              Cell4, Cell2, Cell2, Cell 5
-FCKTableHandler._CreateTableMap = function( table )
+FCKTableHandler._CreateTableMap = function( refCell )
 {
+        var table = refCell.parentNode.parentNode.parentNode ;
         var aRows = table.rows ;
 
         // Row and Column counters.
@@ -675 +701 @@
 }
 
 // This function is the inverse of _CreateTableMap - it takes in a table map and converts it to an HTML table.
-FCKTableHandler._InstallTableMap = function( tableMap, table )
+FCKTableHandler._InstallTableMap = function( tableMap, refCell )
 {
+        var table = refCell.parentNode.parentNode.parentNode ;
         // Clear the table of all rows first.
         while ( table.rows.length > 0 )
         {
@@ -771 +798 @@
                         if ( cell.rowSpan == 1 )
                                 cell.removeAttribute( 'rowspan' ) ;
                 }
-                table.appendChild( rowObj ) ;
+                // If the table has a thead and we want to insert the second row or higher,
+                // insert it in tbody
+                if ( table.tHead && i != 0 )
+                {
+                        table.firstChild.nextSibling.appendChild( rowObj )
+                }
+                // otherwise insert the row in thead (if there is one) or tbody
+                else
+                {
+                        table.firstChild.appendChild( rowObj ) ;
+                }
         }
 }
 
@@ -805 +842 @@
                 return null ;
 
         var refCell = cells[0] ;
-        var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ;
+        var tableMap = this._CreateTableMap( refCell ) ;
         var rowIdx = refCell.parentNode.rowIndex ;
         var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
         var nextColIdx = colIdx + ( isNaN( refCell.colSpan ) ? 1 : refCell.colSpan ) ;
@@ -833 +870 @@
                 return null ;
 
         var refCell = cells[0] ;
-        var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ;
+        var tableMap = this._CreateTableMap( refCell ) ;
         var rowIdx = refCell.parentNode.rowIndex ;
         var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
         var newRowIdx = rowIdx + ( isNaN( refCell.rowSpan ) ? 1 : refCell.rowSpan ) ;