Ticket #5936: 5936.patch

_source/plugins/menubutton/plugin.js

@@ -29 +29 @@
                 if ( _.state === CKEDITOR.TRISTATE_DISABLED )
                         return;
 
-                _.previousState = _.state;
+                if ( !_.on )
+                {
+                        _.previousState = _.state;
+                }
 
                 // Check if we already have a menu for it, otherwise just create it.
                 var menu = _.menu;
@@ -41 +44 @@
                         menu.onHide = CKEDITOR.tools.bind( function()
                                 {
                                         this.setState( _.previousState );
+                                        _.on = false;
                                 },
                                 this );
 
@@ -53 +57 @@
 
                 if ( _.on )
                 {
-                        menu.hide();
+                        menu._.menu.hide();
+                        menu.editor.focus();
                         return;
                 }
 
+                menu.show( CKEDITOR.document.getById( this._.id ), 4 );
+
+                /**
+                 * menu.show() hides the menu before show it
+                 * so let set state to ON after menu.show
+                 * to prevent enabled button after second click
+                 */
                 this.setState( CKEDITOR.TRISTATE_ON );
 
-                menu.show( CKEDITOR.document.getById( this._.id ), 4 );
+                _.on = true;
         };