Ticket #7904: 7904_3.patch

_source/plugins/richcombo/plugin.js

@@ -276 +276 @@
                                         else
                                                 me.setValue( '' );
 
-                                        panel.hide();
+                                        panel.hide( false );
                                 };
 
                         this._.panel = panel;

_source/plugins/menu/plugin.js

@@ -114 +114 @@
 
                         onClick : function( item )
                         {
-                                this.hide();
+                                this.hide( false );
 
                                 if ( item.onClick )
                                         item.onClick();
@@ -354 +354 @@
                                 this._.listeners.push( listenerFn );
                         },
 
-                        hide : function()
+                        hide : function( returnFocus )
                         {
                                 this._.onHide && this._.onHide();
-                                this._.panel && this._.panel.hide();
+                                this._.panel && this._.panel.hide( returnFocus );
                         }
                 }
         });

_source/plugins/floatpanel/plugin.js

@@ -324 +324 @@
                                 isShowing = 0;
                         },
 
-                        hide : function()
+                        hide : function( returnFocus )
                         {
                                 if ( this.visible && ( !this.onHide || this.onHide.call( this ) !== true ) )
                                 {
@@ -336 +336 @@
                                         this.element.getFirst().removeCustomData( 'activePanel' );
 
                                         // Return focus properly. (#6247)
-                                        var focusReturn = this._.returnFocus;
+                                        var focusReturn = returnFocus !== false && this._.returnFocus;
                                         if ( focusReturn )
                                         {
                                                 // Webkit requires focus moved out panel iframe first.