Ticket #6640: 6640_3.patch

_source/plugins/floatpanel/plugin.js

@@ -60 +60 @@
                                 children : [],
                                 dir : editor.lang.dir
                         };
+
+                        editor.on( 'mode', function(){ this.hide(); }, this );
                 },
 
                 proto :

_source/plugins/menubutton/plugin.js

@@ -29 +29 @@
                 if ( _.state === CKEDITOR.TRISTATE_DISABLED )
                         return;
 
-                _.previousState = _.state;
-
                 // Check if we already have a menu for it, otherwise just create it.
                 var menu = _.menu;
                 if ( !menu )
@@ -40 +38 @@
 
                         menu.onHide = CKEDITOR.tools.bind( function()
                                 {
-                                        this.setState( _.previousState );
+                                        this.setState( this.modes && this.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
                                 },
                                 this );
 
                         // Initialize the menu items at this point.
                         if ( this.onMenu )
-                        {
                                 menu.addListener( this.onMenu );
-                        }
                 }
 
                 if ( _.on )

_source/plugins/richcombo/plugin.js

@@ -244 +244 @@
                                         if ( me.className )
                                                 this.element.getFirst().removeClass( me.className + '_panel' );
 
-                                        me.setState( CKEDITOR.TRISTATE_OFF );
+                                        me.setState( me.modes && me.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
 
                                         me._.on = 0;