Ticket #6812: 6812.patch

_source/plugins/scayt/plugin.js

@@ -595 +595 @@
                                                 label : lang.title,
                                                 title : CKEDITOR.env.opera ? lang.opera_title : lang.title,
                                                 className : 'cke_button_scayt',
+                                                modes : { wysiwyg : 1 },
                                                 onRender: function()
                                                 {
                                                         command.on( 'state', function()

_source/plugins/button/plugin.js

@@ -137 +137 @@
 
                 instance.index = index = CKEDITOR.ui.button._.instances.push( instance ) - 1;
 
+                // Indicate a mode sensitive button.
                 if ( this.modes )
                 {
+                        var modeStates = {};
+
+                        editor.on( 'beforeModeUnload', function()
+                                {
+                                        modeStates[ editor.mode ] = this._.state;
+                                }, this );
+
                         editor.on( 'mode', function()
                                 {
-                                        this.setState( this.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
+                                        var mode = editor.mode;
+
+                                        // Restore saved button state.
+                                        this.setState( this.modes[ mode ] ? modeStates[ mode ] != undefined ? modeStates[ mode ] : CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
                                 }, this);
                 }
                 else if ( command )