Ticket #2868: 2868.patch

commandclasses/fcktablecommand.js

@@ -31 +31 @@
 {
         FCKUndo.SaveUndoStep() ;
 
-        if ( ! FCKBrowserInfo.IsGecko )
-        {
-                switch ( this.Name )
-                {
-                        case 'TableMergeRight' :
-                                return FCKTableHandler.MergeRight() ;
-                        case 'TableMergeDown' :
-                                return FCKTableHandler.MergeDown() ;
-                }
-        }
-
         switch ( this.Name )
         {
                 case 'TableInsertRowAfter' :
@@ -64 +53 @@
                         return FCKTableHandler.DeleteCells() ;
                 case 'TableMergeCells' :
                         return FCKTableHandler.MergeCells() ;
+                case 'TableMergeRight' :
+                        return FCKTableHandler.MergeRight() ;
+                case 'TableMergeDown' :
+                        return FCKTableHandler.MergeDown() ;
                 case 'TableHorizontalSplitCell' :
                         return FCKTableHandler.HorizontalSplitCell() ;
                 case 'TableVerticalSplitCell' :

internals/fck_contextmenu.js

@@ -76 +76 @@
                                         if ( FCKBrowserInfo.IsGecko )
                                                 oItem.AddItem( 'TableMergeCells'        , FCKLang.MergeCells, 60,
                                                         FCKCommands.GetCommand( 'TableMergeCells' ).GetState() == FCK_TRISTATE_DISABLED ) ;
-                                        else
-                                        {
-                                                oItem.AddItem( 'TableMergeRight'        , FCKLang.MergeRight, 60,
-                                                        FCKCommands.GetCommand( 'TableMergeRight' ).GetState() == FCK_TRISTATE_DISABLED ) ;
-                                                oItem.AddItem( 'TableMergeDown'         , FCKLang.MergeDown, 60,
-                                                        FCKCommands.GetCommand( 'TableMergeDown' ).GetState() == FCK_TRISTATE_DISABLED ) ;
-                                        }
+                                        oItem.AddItem( 'TableMergeRight'        , FCKLang.MergeRight, 60,
+                                                FCKCommands.GetCommand( 'TableMergeRight' ).GetState() == FCK_TRISTATE_DISABLED ) ;
+                                        oItem.AddItem( 'TableMergeDown'         , FCKLang.MergeDown, 60,
+                                                FCKCommands.GetCommand( 'TableMergeDown' ).GetState() == FCK_TRISTATE_DISABLED ) ;
                                         oItem.AddItem( 'TableHorizontalSplitCell'       , FCKLang.HorizontalSplitCell, 61,
                                                 FCKCommands.GetCommand( 'TableHorizontalSplitCell' ).GetState() == FCK_TRISTATE_DISABLED ) ;
                                         oItem.AddItem( 'TableVerticalSplitCell' , FCKLang.VerticalSplitCell, 61,