Ticket #3060: 3060.patch

_source/plugins/button/plugin.js

@@ -58 +58 @@
         this.className = definition.className || ( definition.command && 'cke_button_' + definition.command ) || '';
 
         /**
+         * Button is disabled in editor mode which name doesn't exist on this list. 
+         * Ingored if command name is defined.
+         * @name CKEDITOR.ui.button.prototype.activeInModes
+         * @type Array of Strings
+         * @example
+         */
+        this.activeInModes = definition.activeInModes;
+
+        /**
          * The function to be called when the user clicks the button. If not
          * defined, the "command" property is required, and the command gets
          * executed on click.
@@ -114 +123 @@
                         },
                         execute : function()
                         {
-                                this.button.click( editor );
+                                if ( this.button._.currentState != CKEDITOR.TRISTATE_DISABLED )         // Button isn't disabled.
+                                        this.button.click( editor );
                         }
                 };
 
@@ -144 +154 @@
                         }
                 }
 
+                if ( !command )                 // Buttons without command.
+                {
+                        this._.currentState = this.stateInEditorMode( editor.mode );
+
+                        classes += ' cke_' + (
+                                this._.currentState == CKEDITOR.TRISTATE_ON ? 'on' :
+                                this._.currentState == CKEDITOR.TRISTATE_DISABLED ? 'disabled' :
+                                'off' );
+
+                        if ( this.activeInModes )
+                        {
+                                editor.on( 'mode', function()
+                                        {
+                                                this.setState( this.stateInEditorMode( editor.mode ) );
+                                        }, this );
+                        }
+                }
+
                 if ( this.className )
                         classes += ' ' + this.className;
 
@@ -209 +237 @@
                 }
 
                 this._.currentState = state;
+        },
+        stateInEditorMode : function ( editorMode ) 
+        {
+                if ( this.activeInModes )
+                {
+                        var index = CKEDITOR.tools.indexOf( this.activeInModes, editorMode );
+                        return ( index == -1 ) ? CKEDITOR.TRISTATE_DISABLED : CKEDITOR.TRISTATE_OFF;
+                }
+
+                return this._.currentState ? this._.currentState : CKEDITOR.TRISTATE_OFF;
         }
 };
 

_source/plugins/colorbutton/plugin.js

@@ -25 +25 @@
                                         label : lang.label,
                                         title : lang.panelTitle,
                                         className : 'cke_button_' + name.toLowerCase(),
+                                        activeInModes : [ 'wysiwyg' ],
 
                                         panel :
                                         {

_source/plugins/panelbutton/plugin.js

@@ -79 +79 @@
                                 {
                                         var _ = this._;
 
+                                        if ( _.currentState == CKEDITOR.TRISTATE_DISABLED )
+                                                return false;
+
                                         this.createPanel();
 
                                         if ( _.on )
@@ -93 +96 @@
 
                         var label = this.label || '';
 
-                        var classes = 'cke_button cke_off';
+                        var classes = 'cke_button';
 
+                        if ( this.activeInModes )
+                        {
+                                this._.currentState = this.stateInEditorMode( editor.mode );
+                                classes += ' cke_' + ( ( this._.currentState == CKEDITOR.TRISTATE_DISABLED ) ? 'disabled' : 'off' );
+                                
+                                editor.on( 'mode', function()
+                                        {
+                                                this.setState( this.stateInEditorMode( editor.mode ) );
+                                        }, this );
+                        }
+                        else
+                        {
+                                classes += ' cke_off';
+                                this._.currentState =  CKEDITOR.TRISTATE_OFF;
+                        }
+
                         if ( this.className )
                                 classes += ' ' + this.className;
 
@@ -178 +197 @@
                                 this.onBlock( panel, _.id );
                 },
 
+                stateInEditorMode : CKEDITOR.ui.button.prototype.stateInEditorMode,
                 setState : CKEDITOR.ui.button.prototype.setState
         }
 });