Ticket #2912: 2912.patch

_source/core/command.js

@@ -5 +5 @@
 
 CKEDITOR.command = function( editor, commandDefinition )
 {
-        this.state = CKEDITOR.TRISTATE_OFF;
+        this.state = ( 'state' in commandDefinition ) ? commandDefinition.state : CKEDITOR.TRISTATE_OFF;
 
         this.exec = function()
         {
@@ -18 +18 @@
         CKEDITOR.event.call( this );
 };
 
+CKEDITOR.command.prototype =
+{
+        setState : function( newState )
+        {
+                // Do nothing if there is no state change.
+                if ( this.state == newState )
+                        return false;
+
+                // Set the new state.
+                this.state = newState;
+
+                // Fire the "state" event, so other parts of the code can react to the
+                // change.
+                this.fire( 'state' );
+
+                return true;
+        }
+}
+
 CKEDITOR.event.implementOn( CKEDITOR.command.prototype );

_source/plugins/basicstyles/plugin.js

@@ -17 +17 @@
 
                         editor.attachStyleStateChange( style, function( state )
                                 {
-                                        var command = editor.getCommand( commandName );
-                                        command.state = state;
-                                        command.fire( 'state' );
+                                        editor.getCommand( commandName ).setState( state );
                                 });
 
                         editor.addCommand( commandName, new CKEDITOR.styleCommand( style ) );

_source/plugins/indent/plugin.js

@@ -13 +13 @@
 
         function setState( editor, state )
         {
-                var command = editor.getCommand( this.name );
-                command.state = state;
-                command.fire( 'state' );
+                editor.getCommand( this.name ).setState( state );
         }
 
         function onSelectionChange( evt )

_source/plugins/link/plugin.js

@@ -60 +60 @@
                                 var command = editor.getCommand( 'unlink' ),
                                         element = evt.data.path.lastElement.getAscendant( 'a', true );
                                 if ( element && element.getName() == 'a' && element.getAttribute( 'href' ) )
-                                        command.state = CKEDITOR.TRISTATE_OFF;
+                                        command.setState( CKEDITOR.TRISTATE_OFF );
                                 else
-                                        command.state = CKEDITOR.TRISTATE_DISABLED;
-                                command.fire( 'state' );
+                                        command.setState( CKEDITOR.TRISTATE_DISABLED );
                         } );
 
                 // Register a contentDom handler for displaying placeholders after mode change.

_source/plugins/list/plugin.js

@@ -168 +168 @@
 
         function setState( editor, state )
         {
-                var command = editor.getCommand( this.name );
-                command.state = state;
-                command.fire( 'state' );
+                editor.getCommand( this.name ).setState( state );
         }
 
         function onSelectionChange( evt )

_source/plugins/sourcearea/plugin.js

@@ -113 +113 @@
 
                 editor.on( 'mode', function()
                         {
-                                var command = editor.getCommand( 'source' );
-                                command.state = ( editor.mode == 'source' ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );
-                                command.fire( 'state' );
+                                editor.getCommand( 'source' ).setState( 
+                                        editor.mode == 'source' ? 
+                                                CKEDITOR.TRISTATE_ON : 
+                                                CKEDITOR.TRISTATE_OFF );
                         });
         }
 });