Ticket #1865: 1865_2.patch

editor/_source/internals/fcktablehandler.js

@@ -52 +52 @@
                 //queue up the rows -- it's possible ( and likely ) that we may get duplicates
                 for ( var i = 0; i < aCells.length; i++ )
                 {
-                        var oRow = FCKTools.GetElementAscensor( aCells[i],'TR' ) ;
+                        var oRow = aCells[i].parentNode ;
                         aRowsToDelete[oRow.rowIndex] = oRow ;
                 }
                 for ( var i = aRowsToDelete.length; i >= 0; i-- )
@@ -118 +118 @@
 
         var iIndex = oCell.cellIndex ;
 
-        // Loop throw all rows available in the table.
+        // Loop through all rows available in the table.
         for ( var i = 0 ; i < oTable.rows.length ; i++ )
         {
                 // Get the row.
                 var oRow = oTable.rows[i] ;
 
-                // If the row doens't have enough cells, ignore it.
+                // If the row doesn't have enough cells, ignore it.
                 if ( oRow.cells.length < ( iIndex + 1 ) )
                         continue ;
 
@@ -136 +136 @@
                 // Get back the currently selected cell.
                 var oBaseCell = oRow.cells[iIndex] ;
 
-                if ( insertBefore )
-                        oRow.insertBefore( oCell, oBaseCell ) ;
-                else if ( oBaseCell.nextSibling )
-                        oRow.insertBefore( oCell, oBaseCell.nextSibling ) ;
-                else
-                        oRow.appendChild( oCell ) ;
+                oRow.insertBefore( oCell, ( insertBefore ? oBaseCell : oBaseCell.nextSibling ) ) ;
         }
 }
 
@@ -218 +213 @@
         if ( cell.parentNode.cells.length == 1 )
         {
                 // Delete the entire row.
-                FCKTableHandler.DeleteRows( FCKTools.GetElementAscensor( cell, 'TR' ) ) ;
+                FCKTableHandler.DeleteRows( cell.parentNode ) ;
                 return ;
         }
 
@@ -246 +241 @@
 {
         for ( var i = 0 ; i < cells.length ; i++ )
         {
-                if ( FCKBrowserInfo.IsIE )
-                        cells[i].removeAttribute( label ) ;
-                else
-                        delete cells[i][label] ;
+                FCKDomTools.ClearElementJSProperty(cells[i], label ) ;
         }
 }
 
@@ -385 +377 @@
                         }
                 }
                 if ( rowChildNodesCount > 0 )
-                        cellContents.appendChild( FCKTools.GetElementDocument( refCell ).createElement( 'br' ) ) ;
+                        cellContents.appendChild( FCK.EditorDocument.createElement( 'br' ) ) ;
         }
 
         this._ReplaceCellsByMarker( tableMap, '_SelectedCells', refCell ) ;
@@ -434 +426 @@
         while ( nextCell && nextCell.childNodes && nextCell.childNodes.length > 0 )
                 cellContents.appendChild( nextCell.removeChild( nextCell.firstChild ) ) ;
         if ( cellContents.firstChild )
-                cellContents.insertBefore( FCKTools.GetElementDocument( nextCell ).createElement( 'br' ), cellContents.firstChild ) ;
+                cellContents.insertBefore( FCK.EditorDocument.createElement( 'br' ), cellContents.firstChild ) ;
         refCell.appendChild( cellContents ) ;
         this._MarkCells( [nextCell], '_Replace' ) ;
         this._ReplaceCellsByMarker( tableMap, '_Replace', refCell ) ;
@@ -619 +611 @@
         return null ;
 }
 
-// Get the cells available in a column of a TableMap.
-FCKTableHandler._GetColumnCells = function( tableMap, columnIndex )
-{
-        var aCollCells = new Array() ;
-
-        for ( var r = 0 ; r < tableMap.length ; r++ )
-        {
-                var oCell = tableMap[r][columnIndex] ;
-                if ( oCell && ( aCollCells.length == 0 || aCollCells[ aCollCells.length - 1 ] != oCell ) )
-                        aCollCells[ aCollCells.length ] = oCell ;
-        }
-
-        return aCollCells ;
-}
-
 // This function is quite hard to explain. It creates a matrix representing all cells in a table.
 // 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
@@ -758 +735 @@
                 for ( var j = 0 ; j < tableMap[i].length ; j++)
                 {
                         var cell = tableMap[i][j] ;
-                        if ( FCKBrowserInfo.IsIE )
-                        {
-                                cell.removeAttribute( '_colScanned' ) ;
-                                cell.removeAttribute( '_rowScanned' ) ;
-                        }
-                        else
-                        {
-                                delete cell._colScanned ;
-                                delete cell._rowScanned ;
-                        }
+                        FCKDomTools.ClearElementJSProperty(cell, '_colScanned' ) ;
+                        FCKDomTools.ClearElementJSProperty(cell, '_rowScanned' ) ;
                 }
         }
 
         // Insert physical rows and columns to the table.
         for ( var i = 0 ; i < tableMap.length ; i++ )
         {
-                var rowObj = FCKTools.GetElementDocument( table ).createElement( 'tr' ) ;
+                var rowObj = FCK.EditorDocument.createElement( 'tr' ) ;
                 for ( var j = 0 ; j < tableMap[i].length ; )
                 {
                         var cell = tableMap[i][j] ;