Ticket #670: 670_2.patch

_source/internals/fckcommands.js

@@ -55 +55 @@
                 case 'AnchorDelete'     : oCommand = new FCKAnchorDeleteCommand() ; break ;
                 case 'BulletedList'     : oCommand = new FCKDialogCommand( 'BulletedList', FCKLang.BulletedListProp             , 'dialog/fck_listprop.html?UL' , 370, 170 ) ; break ;
                 case 'NumberedList'     : oCommand = new FCKDialogCommand( 'NumberedList', FCKLang.NumberedListProp             , 'dialog/fck_listprop.html?OL' , 370, 170 ) ; break ;
-                case 'About'            : oCommand = new FCKDialogCommand( 'About'              , FCKLang.About                                 , 'dialog/fck_about.html'               , 400, 330 ) ; break ;
+                case 'About'            : oCommand = new FCKDialogCommand( 'About'              , FCKLang.About                                 , 'dialog/fck_about.html'               , 400, 330, function(){ return FCK_TRISTATE_OFF ; } ) ; break ;
 
                 case 'Find'                     : oCommand = new FCKDialogCommand( 'Find'               , FCKLang.DlgFindAndReplaceTitle                        , 'dialog/fck_replace.html'             , 340, 250 ) ; break ;
                 case 'Replace'          : oCommand = new FCKDialogCommand( 'Replace'    , FCKLang.DlgFindAndReplaceTitle                , 'dialog/fck_replace.html'             , 340, 250 ) ; break ;

_source/commandclasses/fcktextcolorcommand.js

@@ -75 +75 @@
 
 FCKTextColorCommand.prototype.GetState = function()
 {
+        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                return FCK_TRISTATE_DISABLED ;
         return FCK_TRISTATE_OFF ;
 }
 

_source/commandclasses/fcknamedcommand.js

@@ -33 +33 @@
 
 FCKNamedCommand.prototype.GetState = function()
 {
+        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                return FCK_TRISTATE_DISABLED ;
         return FCK.GetNamedCommandState( this.Name ) ;
 }

_source/commandclasses/fckspellcheckcommand_gecko.js

@@ -35 +35 @@
 
 FCKSpellCheckCommand.prototype.GetState = function()
 {
+        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                return FCK_TRISTATE_DISABLED ;
         return this.IsEnabled ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
-}
- No newline at end of file
+}

_source/commandclasses/fckspellcheckcommand_ie.js

@@ -63 +63 @@
 
 FCKSpellCheckCommand.prototype.GetState = function()
 {
+        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                return FCK_TRISTATE_DISABLED ;
         return this.IsEnabled ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
-}
- No newline at end of file
+}

_source/commandclasses/fckstylecommand.js

@@ -45 +45 @@
 
         GetState : function()
         {
-                if ( !FCK.EditorDocument )
+                if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || !FCK.EditorDocument )
                         return FCK_TRISTATE_DISABLED ;
 
                 if ( FCKSelection.GetType() == 'Control' )

_source/commandclasses/fck_othercommands.js

@@ -47 +47 @@
         if ( this.GetStateFunction )
                 return this.GetStateFunction( this.GetStateParam ) ;
         else
-                return FCK_TRISTATE_OFF ;
+                return FCK.EditMode == FCK_EDITMODE_WYSIWYG ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
 }
 
 // Generic Undefined command (usually used when a command is under development).
@@ -79 +79 @@
         
         GetState : function()
         {
-                return FCK.EditorDocument ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+                return FCK.EditorDocument ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
         }
 };
 
@@ -209 +209 @@
 
 FCKUndoCommand.prototype.GetState = function()
 {
+        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                return FCK_TRISTATE_DISABLED ;
         return ( FCKUndo.CheckUndoState() ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ) ;
 }
 
@@ -225 +227 @@
 
 FCKRedoCommand.prototype.GetState = function()
 {
+        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                return FCK_TRISTATE_DISABLED ;
         return ( FCKUndo.CheckRedoState() ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ) ;
 }
 
@@ -262 +266 @@
 
 FCKPageBreakCommand.prototype.GetState = function()
 {
+        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                return FCK_TRISTATE_DISABLED ;
         return 0 ; // FCK_TRISTATE_OFF
 }
 
@@ -291 +297 @@
 
 FCKUnlinkCommand.prototype.GetState = function()
 {
+        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                return FCK_TRISTATE_DISABLED ;
         var state = FCK.GetNamedCommandState( this.Name ) ;
 
         // Check that it isn't an anchor
@@ -336 +344 @@
 
 FCKSelectAllCommand.prototype.GetState = function()
 {
+        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                return FCK_TRISTATE_DISABLED ;
         return FCK_TRISTATE_OFF ;
 }
 
@@ -357 +367 @@
 
         GetState : function()
         {
+                if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                        return FCK_TRISTATE_DISABLED ;
                 return FCK.GetNamedCommandState( 'Paste' ) ;
         }
 } ;
@@ -377 +389 @@
 
         GetState : function()
         {
+                if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                        return FCK_TRISTATE_DISABLED ;
                 return FCK.GetNamedCommandState( 'InsertHorizontalRule' ) ;
         }
 } ;
@@ -396 +410 @@
 
         GetState : function()
         {
+                if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                        return FCK_TRISTATE_DISABLED ;
                 // Strangely, the cut command happens to have the correct states for both Copy and Cut in all browsers.
                 return FCK.GetNamedCommandState( 'Cut' ) ;
         }
@@ -465 +481 @@
 
         GetState : function()
         {
+                if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                        return FCK_TRISTATE_DISABLED ;
                 return FCK.GetNamedCommandState( 'Unlink') ;
         }
 };

_source/commandclasses/fckpasteplaintextcommand.js

@@ -34 +34 @@
 
 FCKPastePlainTextCommand.prototype.GetState = function()
 {
+        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                return FCK_TRISTATE_DISABLED ;
         return FCK.GetNamedCommandState( 'Paste' ) ;
 }

_source/commandclasses/fckpastewordcommand.js

@@ -33 +33 @@
 
 FCKPasteWordCommand.prototype.GetState = function()
 {
-        if ( FCKConfig.ForcePasteAsPlainText )
+        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || FCKConfig.ForcePasteAsPlainText )
                 return FCK_TRISTATE_DISABLED ;
         else
                 return FCK.GetNamedCommandState( 'Paste' ) ;

_source/commandclasses/fckcorestylecommand.js

@@ -44 +44 @@
                         FCKStyles.ApplyStyle( this.StyleName ) ;
 
                 FCK.Focus() ;
-                FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+                FCK.Events.FireEvent( 'OnSelectionChange' ) ;
         },
 
         GetState : function()
         {
+                if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+                        return FCK_TRISTATE_DISABLED ;
                 return this.IsActive ? FCK_TRISTATE_ON : FCK_TRISTATE_OFF ;
         },