Ticket #1865: 1865_1.patch

editor/_source/internals/fcktablehandler.js

@@ -299 +299 @@
         this._MarkCells( cells, '_CellSelected' ) ;
 
         var tableMap = this._CreateTableMap( cells[0] ) ;
-        var rowIdx = cells[0].parentNode.rowIndex ;
+        var rowIdx = this._GetCellLocation( tableMap, cells[0] )[0] ;                   
         var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, cells[0] ) ;
 
         var geometry = this._GetMarkerGeometry( tableMap, rowIdx, colIdx, '_CellSelected' ) ;
@@ -358 +358 @@
         // Because the checking is already done by FCKTableCommand.
         var refCell = cells[0] ;
         var tableMap = this._CreateTableMap( refCell ) ;
-        var rowIdx = refCell.parentNode.rowIndex ;
+        var rowIdx = this._GetCellLocation( tableMap, refCell )[0] ;
         var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
 
         this._MarkCells( cells, '_SelectedCells' ) ;
@@ -450 +450 @@
                 return ;
 
         var refCell = cells[0] ;
-        var tableMap = this._CreateTableMap( refCell ) ;
+
+        var tableMap = this._CreateTableMap( refCell.offsetParent ) ;
+        var colIdx = FCKTableHandler._GetCellLocation( tableMap, refCell )[1] ;
+
+        var refTable = refCell.offsetParent ;
         var rowIdx = refCell.parentNode.rowIndex ;
-        var colIdx = FCKTableHandler._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
+        var currentRow = refTable.rows[rowIdx] ;
+        var actualColIdx = refCell.cellIndex ;
+
         var cellSpan = isNaN( refCell.colSpan ) ? 1 : refCell.colSpan ;
+        var cellRowSpan = isNaN( refCell.rowSpan ) ? 1 : refCell.rowSpan ;
 
-        if ( cellSpan > 1 )
+        // Given the [x,y] position of the current cell in the tableMap find the respective 
+        // 'y' position (actualColIdx) of the current cell in the refTable DOM object.
+        for ( var j = 0 ; j < currentRow.cells.length ; j++ )
         {
-                // Splitting a multi-column cell - original cell gets ceil(colSpan/2) columns,
-                // new cell gets floor(colSpan/2).
-                var newCellSpan = Math.ceil( cellSpan / 2 ) ;
-                var newCell = FCK.EditorDocument.createElement( refCell.nodeName ) ;
-                if ( FCKBrowserInfo.IsGeckoLike )
-                        FCKTools.AppendBogusBr( newCell ) ;
-                var startIdx = colIdx + newCellSpan ;
-                var endIdx = colIdx + cellSpan ;
-                var rowSpan = isNaN( refCell.rowSpan ) ? 1 : refCell.rowSpan ;
-                for ( var r = rowIdx ; r < rowIdx + rowSpan ; r++ )
+                if ( tableMap[rowIdx][colIdx] == currentRow.cells[j] )
                 {
-                        for ( var i = startIdx ; i < endIdx ; i++ )
-                                tableMap[r][i] = newCell ;
+                        var newCellColIndex = j + 1 ;
+                        break ;
                 }
         }
+
+        // Insert a new cell
+        if ( newCellColIndex > currentRow.cells.length - 1 )
+                var newCell = currentRow.appendChild( FCK.EditorDocument.createElement( refCell.nodeName ) ) ;
         else
+                var newCell = currentRow.insertBefore( FCK.EditorDocument.createElement( refCell.nodeName ), currentRow.cells[newCellColIndex] )        
+        if ( FCKBrowserInfo.IsGeckoLike )
+                FCKTools.AppendBogusBr( newCell ) ;             
+        if ( cellRowSpan > 1 )
+                newCell.rowSpan = cellRowSpan ;
+
+        if ( cellSpan > 1 )
         {
-                // Splitting a single-column cell - add a new cell, and expand
-                // cells crossing the same column.
-                var newTableMap = [] ;
-                for ( var i = 0 ; i < tableMap.length ; i++ )
+                // Splitting a multi-column cell - original cell gets floor(colSpan/2) columns,
+                // new cell gets ceil(colSpan/2)
+                //currentRow.cells[actualColIdx].colSpan = Math.floor( cellSpan / 2 ) ;
+                refCell.colSpan = Math.floor( cellSpan / 2 ) ;
+                newCell.colSpan = Math.ceil( cellSpan / 2 ) ;                   
+        }
+        else
+        {
+                // Splitting a single-column cell - expand cells crossing the same column.
+                for ( var i = 0 ; i < tableMap.length ;  )
                 {
-                        var newRow = tableMap[i].slice( 0, colIdx ) ;
-                        if ( tableMap[i].length <= colIdx )
-                        {
-                                newTableMap.push( newRow ) ;
-                                continue ;
-                        }
-                        if ( tableMap[i][colIdx] == refCell )
-                        {
-                                newRow.push( refCell ) ;
-                                newRow.push( FCK.EditorDocument.createElement( refCell.nodeName ) ) ;
-                                if ( FCKBrowserInfo.IsGeckoLike )
-                                        FCKTools.AppendBogusBr( newRow[newRow.length - 1] ) ;
-                        }
-                        else
-                        {
-                                newRow.push( tableMap[i][colIdx] ) ;
-                                newRow.push( tableMap[i][colIdx] ) ;
-                        }
-                        for ( var j = colIdx + 1 ; j < tableMap[i].length ; j++ )
-                                newRow.push( tableMap[i][j] ) ;
-                        newTableMap.push( newRow ) ;
-                }
-                tableMap = newTableMap ;
+                        if ( i != rowIdx )
+                                tableMap[i][colIdx].colSpan += 1 ;
+                        i += tableMap[i][colIdx].rowSpan ;
+                }               
         }
-
-        this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
 }
 
 FCKTableHandler.VerticalSplitCell = function()
@@ -514 +510 @@
                 return ;
 
         var currentCell = cells[0] ;
-        var tableMap = this._CreateTableMap( currentCell ) ;
+        var tempTableMap = this._CreateTableMap( currentCell ) ;
+        var tempRowIndex = FCKTableHandler._GetCellLocation( tempTableMap, currentCell )[0] ;
+
+        var tableMap = this._CreateTableMap( currentCell.offsetParent ) ;
         var currentRowIndex = currentCell.parentNode.rowIndex ;
         var cellIndex = FCKTableHandler._GetCellIndexSpan( tableMap, currentRowIndex, currentCell ) ;
-        var currentRowSpan = currentCell.rowSpan ;
-        if ( isNaN( currentRowSpan ) )
-                currentRowSpan = 1 ;
 
+        var currentColSpan = isNaN( currentCell.colSpan ) ? 1 : currentCell.colSpan ;
+        var currentRowSpan = isNaN( currentCell.rowSpan ) ? 1 : currentCell.rowSpan ;   
+
         if ( currentRowSpan > 1 )
         {
                 // 1. Set the current cell's rowSpan to 1.
@@ -528 +527 @@
 
                 // 2. Find the appropriate place to insert a new cell at the next row.
                 var newCellRowIndex = currentRowIndex + Math.ceil( currentRowSpan / 2 ) ;
-                var oRow = tableMap[newCellRowIndex] ;
+                var tempCellRowIndex = tempRowIndex + Math.ceil( currentRowSpan / 2 ) ;
+                var oRow = tempTableMap[tempCellRowIndex] ;
                 var insertMarker = null ;
                 for ( var i = cellIndex+1 ; i < oRow.length ; i++ )
                 {
@@ -544 +544 @@
                 newCell.rowSpan = Math.floor( currentRowSpan / 2 ) ;
                 if ( FCKBrowserInfo.IsGeckoLike )
                         FCKTools.AppendBogusBr( newCell ) ;
-                currentCell.parentNode.parentNode.rows[newCellRowIndex].insertBefore( newCell, insertMarker ) ;
+                if ( currentColSpan > 1 )
+                        newCell.colSpan = currentColSpan ;                      
+                currentCell.parentNode.parentNode.rows[tempCellRowIndex].insertBefore( newCell, insertMarker ) ;
         }
         else
         {
                 // 1. Insert a new row.
-                var newCellRowIndex = currentRowIndex + 1 ;
+                //var newCellRowIndex = currentRowIndex + 1 ;
+                var newCellRowIndex = tempRowIndex + 1 ;
                 var newRow = FCK.EditorDocument.createElement( 'tr' ) ;
                 var tBody = currentCell.parentNode.parentNode ;
                 if ( tBody.rows.length > newCellRowIndex )
@@ -557 +560 @@
                 else
                         tBody.appendChild( newRow ) ;
 
+                // 3. Insert a new cell to new row.
+                var newCell = FCK.EditorDocument.createElement( currentCell.nodeName ) ;
+                if ( FCKBrowserInfo.IsGeckoLike )
+                        FCKTools.AppendBogusBr( newCell ) ;
+                if ( currentColSpan > 1 )
+                        newCell.colSpan = currentColSpan ;
+                newRow.appendChild( newCell ) ;
+
                 // 2. +1 to rowSpan for all cells crossing currentCell's row.
                 for ( var i = 0 ; i < tableMap[currentRowIndex].length ; )
                 {
@@ -574 +585 @@
                         tableMap[currentRowIndex][i].rowSpan = rowSpan + 1 ;
                         i += colSpan ;
                 }
-
-                // 3. Insert a new cell to new row.
-                var newCell = FCK.EditorDocument.createElement( currentCell.nodeName ) ;
-                if ( FCKBrowserInfo.IsGeckoLike )
-                        FCKTools.AppendBogusBr( newCell ) ;
-                newRow.appendChild( newCell ) ;
         }
 }
 
@@ -587 +592 @@
 FCKTableHandler._GetCellIndexSpan = function( tableMap, rowIndex, cell )
 {
         if ( tableMap.length < rowIndex + 1 )
-                return null ;
+                null ;
+                
+        var oRow = tableMap[rowIndex] ;
 
-        var oRow = tableMap[ rowIndex ] ;
-
         for ( var c = 0 ; c < oRow.length ; c++ )
         {
                 if ( oRow[c] == cell )
@@ -824 +829 @@
 
         var refCell = cells[0] ;
         var tableMap = this._CreateTableMap( refCell ) ;
-        var rowIdx = refCell.parentNode.rowIndex ;
+        var rowIdx = this._GetCellLocation( tableMap, refCell )[0] ;
         var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
+
         var nextColIdx = colIdx + ( isNaN( refCell.colSpan ) ? 1 : refCell.colSpan ) ;
         var nextCell = tableMap[rowIdx][nextColIdx] ;
 
@@ -852 +858 @@
 
         var refCell = cells[0] ;
         var tableMap = this._CreateTableMap( refCell ) ;
-        var rowIdx = refCell.parentNode.rowIndex ;
+        var rowIdx = this._GetCellLocation( tableMap, refCell )[0] ;
         var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
+
         var newRowIdx = rowIdx + ( isNaN( refCell.rowSpan ) ? 1 : refCell.rowSpan ) ;
         if ( ! tableMap[newRowIdx] )
                 return null ;