Ticket #7882: 7882_2.patch

_source/plugins/menu/plugin.js

@@ -188 +188 @@
                         {
                                 var menu = this._.subMenu,
                                         item = this.items[ index ],
+                                        // Get the element representing the current item.
+                                        element = this._.panel.getBlock( this.id ).element.getDocument().getById( this.id + String( index ) ),
                                         subItemDefs = item.getItems && item.getItems();
 
-                                // If this item has no subitems, we just hide the submenu, if
-                                // available, and return back.
+                                // If this item has no subitems, we just grab the focus, which will hide the submenu.
                                 if ( !subItemDefs )
                                 {
-                                        this._.panel.hideChild();
+                                        element.focus();
                                         return;
                                 }
 
@@ -225 +226 @@
                                         }
                                 }
 
-                                // Get the element representing the current item.
-                                var element = this._.panel.getBlock( this.id ).element.getDocument().getById( this.id + String( index ) );
-
                                 // Show the submenu.
                                 menu.show( element, 2 );
                         }

_source/plugins/floatpanel/plugin.js

@@ -166 +166 @@
                                                         if ( target.getName && target.getName() != 'iframe' )
                                                                 return;
 
-                                                        if ( this.visible && !this._.activeChild && !isShowing )
+                                                        if ( this.visible && !this._.activeChild )
                                                         {
                                                                 // Panel close is caused by user's navigating away the focus, e.g. click outside the panel.
                                                                 // DO NOT restore focus in this case.
@@ -180 +180 @@
                                                 {
                                                         this._.focused = true;
                                                         this.hideChild();
-                                                        this.allowBlur( true );
                                                 },
                                                 this );
 
@@ -310 +309 @@
                                                 CKEDITOR.tools.setTimeout( function()
                                                 {
                                                         iframe.$.contentWindow.focus();
-                                                        // We need this get fired manually because of unfired focus() function.
                                                         this.allowBlur( true );
                                                 }, 0, this);
                                         },  CKEDITOR.env.air ? 200 : 0, this);
@@ -319 +317 @@
                                 if ( this.onShow )
                                         this.onShow.call( this );
 
-                                isShowing = 0;
                         },
 
                         hide : function( returnFocus )