From 485e0a06121d712bccad82a21a9e443292d2f9bb Mon Sep 17 00:00:00 2001
From: Kris Borchers <kris.borchers@gmail.com>
Date: Mon, 26 Aug 2013 00:06:44 -0500
Subject: [PATCH] Menu: Only focus menu after click if focus is on an element
 within menu. Fixes #9044 - Menu: Autofocus issue with dialog opened from menu
 widget

---
 tests/unit/menu/menu_core.js | 18 ++++++++++++++++++
 ui/jquery.ui.menu.js         |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/tests/unit/menu/menu_core.js b/tests/unit/menu/menu_core.js
index 5ee28c14a..923d2961e 100644
--- a/tests/unit/menu/menu_core.js
+++ b/tests/unit/menu/menu_core.js
@@ -27,4 +27,22 @@ test( "accessibility", function () {
 	// Item roles are tested in the role option tests
 });
 
+asyncTest( "#9044: Autofocus issue with dialog opened from menu widget", function() {
+	expect( 1 );
+	var element = $( "#menu1" ).menu();
+
+	$( "<input>", { id: "test9044" } ).appendTo( "body" );
+
+	$( "#testID1" ).bind( "click", function() {
+		$( "#test9044" ).focus();
+	});
+
+	TestHelpers.menu.click( element, "3" );
+	setTimeout( function() {
+		equal( document.activeElement.id, "test9044", "Focus was swallowed by menu" );
+		$( "#test9044" ).remove();
+		start();
+	});
+});
+
 })( jQuery );
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 3352eb8bd..272ab7bf4 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -85,7 +85,8 @@ $.widget( "ui.menu", {
 					// Open submenu on click
 					if ( target.has( ".ui-menu" ).length ) {
 						this.expand( event );
-					} else if ( !this.element.is( ":focus" ) ) {
+					} else if ( !this.element.is( ":focus" ) && $( this.document[ 0 ].activeElement ).closest( ".ui-menu" ).length ) {
+
 						// Redirect focus to the menu
 						this.element.trigger( "focus", [ true ] );