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
jquery · Apr 18, 2014 · 62812d9 · 62812d9
1 parent 1272fca
commit 62812d9
Showing 1 changed file with 6 additions and 5 deletions.
diff --git 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 ) {
+	_selectFocusedItem: function( event ) {
-		if ( !this.menuItems.eq( this.focusIndex ).hasClass( "ui-state-disabled" ) ) {
+		var item = this.menuItems.eq( this.focusIndex );
-			this.menuInstance.select( event );
+		if ( !item.hasClass( "ui-state-disabled" ) ) {
+			this._select( item.data( "ui-selectmenu-item" ), event );
 		}
 	},