Ticket #864: 864.patch

_source/plugins/basicstyles/plugin.js

@@ -11 +11 @@
         {
                 // All buttons use the same code to register. So, to avoid
                 // duplications, let's use this tool function.
-                var addButtonCommand = function( buttonName, buttonLabel, commandName, styleDefiniton )
+                var addButtonCommand = function( buttonName, buttonLabel, commandName, styleDefiniton, toggles )
                 {
                         var style = new CKEDITOR.style( styleDefiniton );
 
@@ -20 +20 @@
                                         !editor.readOnly && editor.getCommand( commandName ).setState( state );
                                 });
 
-                        editor.addCommand( commandName, new CKEDITOR.styleCommand( style ) );
+                        editor.addCommand( commandName, new CKEDITOR.styleCommand( style, toggles ) );
 
                         editor.ui.addButton( buttonName,
                                 {
@@ -36 +36 @@
                 addButtonCommand( 'Italic'              , lang.italic           , 'italic'              , config.coreStyles_italic );
                 addButtonCommand( 'Underline'   , lang.underline                , 'underline'   , config.coreStyles_underline );
                 addButtonCommand( 'Strike'              , lang.strike           , 'strike'              , config.coreStyles_strike );
-                addButtonCommand( 'Subscript'   , lang.subscript                , 'subscript'   , config.coreStyles_subscript );
-                addButtonCommand( 'Superscript' , lang.superscript              , 'superscript' , config.coreStyles_superscript );
+                addButtonCommand( 'Subscript'   , lang.subscript                , 'subscript'   , config.coreStyles_subscript,  'superscript' );
+                addButtonCommand( 'Superscript' , lang.superscript              , 'superscript' , config.coreStyles_superscript,        'subscript' );
         }
 });
 

_source/plugins/styles/plugin.js

@@ -1532 +1532 @@
         }
 })();
 
-CKEDITOR.styleCommand = function( style )
+CKEDITOR.styleCommand = function( style, toggles )
 {
         this.style = style;
+        toggles && ( this.toggles = toggles );
 };
 
 CKEDITOR.styleCommand.prototype.exec = function( editor )
@@ -1546 +1547 @@
         if ( doc )
         {
                 if ( this.state == CKEDITOR.TRISTATE_OFF )
+                {
+                        var toggles = this.toggles && editor.getCommand( this.toggles );
+                        toggles && ( toggles.state == CKEDITOR.TRISTATE_ON ) && toggles.style.remove( doc );
                         this.style.apply( doc );
+                }
                 else if ( this.state == CKEDITOR.TRISTATE_ON )
                         this.style.remove( doc );
         }