Skip to content
Permalink
Browse files

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
  • Loading branch information
scottgonzalez committed Apr 8, 2014
1 parent 1272fca commit 62812d9c670a5e595e12cae454000231c3f591f3
Showing with 6 additions and 5 deletions.
  1. +6 −5 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 );
}
},

0 comments on commit 62812d9

Please sign in to comment.
You can’t perform that action at this time.