From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 8 Apr 2014 15:20:38 +0000 (-0400)
Subject: Selectmenu: Simplify selection of focused item via keyboard
X-Git-Tag: 1.11.0-beta.1~36
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=62812d9c670a5e595e12cae454000231c3f591f3;p=jquery-ui.git

Selectmenu: Simplify selection of focused item via keyboard

Don't go through menu to select the currently focused item.

Renamed _selectMenu() to _selectFocusedItem() for clarity.

Closes gh-1224
---

diff --git a/ui/selectmenu.js b/ui/selectmenu.js
index a612d1982..7fc2119cb 100644
--- a/ui/selectmenu.js
+++ b/ui/selectmenu.js
@@ -363,7 +363,7 @@ return $.widget( "ui.selectmenu", {
 					break;
 				case $.ui.keyCode.ENTER:
 					if ( this.isOpen ) {
-						this._selectMenu( event );
+						this._selectFocusedItem( event );
 					}
 					break;
 				case $.ui.keyCode.UP:
@@ -382,7 +382,7 @@ return $.widget( "ui.selectmenu", {
 					break;
 				case $.ui.keyCode.SPACE:
 					if ( this.isOpen ) {
-						this._selectMenu( event );
+						this._selectFocusedItem( event );
 					} else {
 						this._toggle( event );
 					}
@@ -412,9 +412,10 @@ return $.widget( "ui.selectmenu", {
 		}
 	},
 
-	_selectMenu: function( event ) {
-		if ( !this.menuItems.eq( this.focusIndex ).hasClass( "ui-state-disabled" ) ) {
-			this.menuInstance.select( event );
+	_selectFocusedItem: function( event ) {
+		var item = this.menuItems.eq( this.focusIndex );
+		if ( !item.hasClass( "ui-state-disabled" ) ) {
+			this._select( item.data( "ui-selectmenu-item" ), event );
 		}
 	},