Ticket #1865: 1865.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 ) ;
 
@@ -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 ;
@@ -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 ;
@@ -629 +629 @@
 // 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.
@@ -805 +807 @@
                 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 +835 @@
                 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 ) ;