Changeset 1479

Timestamp:

2008-02-05 21:52:01 (6 months ago)

Author:

alfonsoml

Message:

Fix for #805. Don't execute with the keystroke a command if it is disabled.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fck.js (modified) (2 diffs)
• _whatsnew.html (modified) (1 diff)

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

@@ -1011 +1011 @@
         // be cancelled. Let's do that only if the Execute() call explicitly returns "false".
         var oCommand = FCK.Commands.GetCommand( keystrokeValue ) ;
+
+        // If the command is disabled then ignore the keystroke
+        if ( oCommand.GetState() == FCK_TRISTATE_DISABLED )
+                return false ;
+
         return ( oCommand.Execute.apply( oCommand, FCKTools.ArgumentsToArray( arguments, 2 ) ) !== false ) ;
 }
@@ -1169 +1174 @@
 
 
+

FCKeditor/trunk/_whatsnew.html

@@ -76 +76 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1782">#1782</a>] Clicking on radio
                         buttons or checkboxes in the editor in IE will no longer cause lockups in IE.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/805">#805</a>] The FCKConfig.Keystrokes
+                        commands where executed even if the command itself was disabled.</li>
         </ul>
         <p>