Changeset 692

Timestamp:

2007-08-20 19:20:39 (17 months ago)

Author:

martinkou

Message:

"Merge Right" command should be disabled when the vertical positions of the cells are different.
Fix for #1076 : "Merge Right" command merges the wrong cells in some circumstances, due to inaccurate table position calculations.
"Merge Right" and "Merge Down" should be used instead of "Merge Cells" in Safari and Opera due to the browsers' inability to select a rectangular area in a table.

Location:

FCKeditor/trunk/editor/_source

Files:

• commandclasses/fcktablecommand.js (modified) (4 diffs)
• internals/fck_contextmenu.js (modified) (2 diffs)
• internals/fcktablehandler.js (modified) (5 diffs)

FCKeditor/trunk/editor/_source/commandclasses/fcktablecommand.js

@@ -32 +32 @@
         FCKUndo.SaveUndoStep() ;
 
-        if ( FCKBrowserInfo.IsIE )
+        if ( ! FCKBrowserInfo.IsGecko )
         {
                 switch ( this.Name )
@@ -97 +97 @@
                         case 'TableHorizontalSplitCell' :
                         case 'TableVerticalSplitCell' :
-                        case 'TableMergeRight' :
                         case 'TableMergeDown' :
                                 if ( FCKTableHandler.GetSelectedCells().length == 1 )
@@ -103 +102 @@
                                 else
                                         return FCK_TRISTATE_DISABLED ;
-                                break ;
                         case 'TableMergeCells' :
                                 if ( FCKTableHandler.CheckIsSelectionRectangular() 
@@ -110 +108 @@
                                 else
                                         return FCK_TRISTATE_DISABLED ;
+                        case 'TableMergeRight' :
+                                return FCKTableHandler.GetMergeRightTarget() ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
                         default :
                                 return FCK_TRISTATE_OFF ;

FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js

@@ -74 +74 @@
                                         oItem.AddItem( 'TableInsertCellAfter'   , FCKLang.InsertCellAfter, 58 ) ;
                                         oItem.AddItem( 'TableDeleteCells'       , FCKLang.DeleteCells, 59 ) ;
-                                        if ( FCKBrowserInfo.IsIE )
+                                        if ( FCKBrowserInfo.IsGecko )
+                                                oItem.AddItem( 'TableMergeCells'        , FCKLang.MergeCells, 60,
+                                                        FCKCommands.GetCommand( 'TableMergeCells' ).GetState() == FCK_TRISTATE_DISABLED ) ;
+                                        else
                                         {
                                                 oItem.AddItem( 'TableMergeRight'        , FCKLang.MergeRight, 60, 
@@ -81 +84 @@
                                                         FCKCommands.GetCommand( 'TableMergeDown' ).GetState() == FCK_TRISTATE_DISABLED ) ;
                                         }
-                                        else
-                                                oItem.AddItem( 'TableMergeCells'        , FCKLang.MergeCells, 60,
-                                                        FCKCommands.GetCommand( 'TableMergeCells' ).GetState() == FCK_TRISTATE_DISABLED ) ;
                                         oItem.AddItem( 'TableHorizontalSplitCell'       , FCKLang.HorizontalSplitCell, 61,
                                                 FCKCommands.GetCommand( 'TableHorizontalSplitCell' ).GetState() == FCK_TRISTATE_DISABLED ) ;

FCKeditor/trunk/editor/_source/internals/fcktablehandler.js

@@ -255 +255 @@
 }
 
+FCKTableHandler._ReplaceCellsByMarker = function( tableMap, marker, substitute )
+{
+        for ( var i = 0 ; i < tableMap.length ; i++ )
+        {
+                for ( var j = 0 ; j < tableMap[i].length ; j++ )
+                {
+                        if ( tableMap[i][j][marker] )
+                                tableMap[i][j] = substitute ;
+                }
+        }
+}
+
 FCKTableHandler._GetMarkerGeometry = function( tableMap, rowIdx, colIdx, markerName )
 {
@@ -352 +364 @@
 FCKTableHandler.MergeRight = function()
 {
-        if ( ! FCKBrowserInfo.IsIE )
-        {
-                alert( 'This method should be called in IE only.' ) ;
+        var target = this.GetMergeRightTarget() ;
+        if ( target == null )
                 return ;
-        }
-        var cells = FCKTableHandler.GetSelectedCells() ;
-        if ( cells.length != 1 )
-                return ;
-        
-        var currentCell = cells[0] ;
-        var nextCell = currentCell.parentNode.cells[currentCell.cellIndex + 1] ;
-        var nextColSpan = nextCell.colSpan ;
-        if ( isNaN( nextColSpan ) )
-                nextColSpan = 1 ;
-
-        if ( ! nextCell )
-                return ;
+        var refCell = target.refCell ;
+        var tableMap = target.tableMap ;
+        var nextCell = target.nextCell ; 
 
         var cellContents = FCK.EditorDocument.createDocumentFragment() ;
@@ -375 +376 @@
 
         nextCell.parentNode.removeChild( nextCell ) ;
-        if ( isNaN( currentCell.colSpan ) )
-                currentCell.colSpan = 1 ;
-        currentCell.colSpan += nextColSpan ;
-
-        currentCell.appendChild( cellContents ) ;
+        refCell.appendChild( cellContents ) ;
+        this._MarkCells( [nextCell], '_Replace' ) ;
+        this._ReplaceCellsByMarker( tableMap, '_Replace', refCell ) ;
+        this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
 }
 
 FCKTableHandler.MergeDown = function()
 {
-        if ( ! FCKBrowserInfo.IsIE )
-        {
-                alert( 'This method should be called in IE only.' ) ;
-                return ;
-        }
         var cells = FCKTableHandler.GetSelectedCells() ;
         if ( cells.length != 1 )
@@ -686 +681 @@
                 {
                         var cell = tableMap[i][j] ;
-                        if ( FCKBrowser.IsIE )
+                        if ( FCKBrowserInfo.IsIE )
                         {
                                 cell.removeAttribute( '_colScanned' ) ;
@@ -744 +739 @@
                 return FCK_TRISTATE_DISABLED ;
 }
+
+FCKTableHandler.GetMergeRightTarget = function()
+{
+        var cells = this.GetSelectedCells() ;
+        if ( cells.length != 1 )
+                return null ;
+
+        var refCell = cells[0] ;
+        var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ;
+        var rowIdx = refCell.parentNode.rowIndex ;
+        var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
+        var nextColIdx = colIdx + ( isNaN( refCell.colSpan ) ? 1 : refCell.colSpan ) ;
+        var nextCell = tableMap[rowIdx][nextColIdx] ;
+
+        if ( ! nextCell )
+                return null ;
+
+        // The two cells must have the same vertical geometry, otherwise merging does not make sense.
+        this._MarkCells( [refCell, nextCell], '_SizeTest' ) ;
+        var refGeometry = this._GetMarkerGeometry( tableMap, rowIdx, colIdx, '_SizeTest' ) ;
+        var nextGeometry = this._GetMarkerGeometry( tableMap, rowIdx, nextColIdx, '_SizeTest' ) ;
+        this._UnmarkCells( [refCell, nextCell], '_SizeTest' ) ;
+
+        if ( refGeometry.height != nextGeometry.height || refGeometry.y != nextGeometry.y )
+                return null ;
+
+        return { refCell : refCell, nextCell : nextCell, tableMap : tableMap } ;
+}