From 6b6b49f678706280c5590a5097ef9f0aca359d4b Mon Sep 17 00:00:00 2001
From: TJ VanToll <tj.vantoll@gmail.com>
Date: Thu, 2 Oct 2014 17:15:07 -0400
Subject: [PATCH] Menu: Maintain focus on already selected item during
 typeahead

Fixes #10644
Closes gh-1354
---
 tests/unit/menu/menu_events.js | 22 ++++++++++++++++++++++
 ui/menu.js                     |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index 0a02cc01b..ff7eb4c7c 100644
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -629,6 +629,28 @@ asyncTest( "handle keyboard navigation with spelling of menu items", function()
 	element[ 0 ].focus();
 });
 
+asyncTest( "Keep focus on selected item (see #10644)", function() {
+	expect( 1 );
+	var element = $( "#menu2" ).menu({
+		focus: function( event ) {
+			log( $( event.target ).find( ".ui-state-focus" ).index() );
+		}
+	});
+
+	log( "keydown", true );
+	element.one( "menufocus", function() {
+		element.simulate( "keydown", { keyCode: 65 } );
+		element.simulate( "keydown", { keyCode: 68 } );
+		element.simulate( "keydown", { keyCode: 68 } );
+		element.simulate( "keydown", { keyCode: 89 } );
+		element.simulate( "keydown", { keyCode: 83 } );
+		equal( logOutput(), "keydown,0,1,3,3,3",
+			"Focus stays on 'Addyston', even after other options are eliminated" );
+		start();
+	});
+	element[ 0 ].focus();
+});
+
 test( "#9469: Stopping propagation in a select event should not suppress subsequent select events.", function() {
 	expect( 1 );
 	var element = $( "#menu1" ).menu({
diff --git a/ui/menu.js b/ui/menu.js
index 9664e37ef..1ecc0ea8c 100644
--- a/ui/menu.js
+++ b/ui/menu.js
@@ -251,7 +251,7 @@ return $.widget( "ui.menu", {
 
 			if ( match.length ) {
 				this.focus( event, match );
-				if ( match.length > 1 ) {
+				if ( match.length > 0 ) {
 					this.previousFilter = character;
 					this.filterTimer = this._delay(function() {
 						delete this.previousFilter;
-- 
2.39.5