Skip to content

Commit 62812d9

Browse files
committed
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
1 parent 1272fca commit 62812d9

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

ui/selectmenu.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ return $.widget( "ui.selectmenu", {
363363
break;
364364
case $.ui.keyCode.ENTER:
365365
if ( this.isOpen ) {
366-
this._selectMenu( event );
366+
this._selectFocusedItem( event );
367367
}
368368
break;
369369
case $.ui.keyCode.UP:
@@ -382,7 +382,7 @@ return $.widget( "ui.selectmenu", {
382382
break;
383383
case $.ui.keyCode.SPACE:
384384
if ( this.isOpen ) {
385-
this._selectMenu( event );
385+
this._selectFocusedItem( event );
386386
} else {
387387
this._toggle( event );
388388
}
@@ -412,9 +412,10 @@ return $.widget( "ui.selectmenu", {
412412
}
413413
},
414414

415-
_selectMenu: function( event ) {
416-
if ( !this.menuItems.eq( this.focusIndex ).hasClass( "ui-state-disabled" ) ) {
417-
this.menuInstance.select( event );
415+
_selectFocusedItem: function( event ) {
416+
var item = this.menuItems.eq( this.focusIndex );
417+
if ( !item.hasClass( "ui-state-disabled" ) ) {
418+
this._select( item.data( "ui-selectmenu-item" ), event );
418419
}
419420
},
420421

0 commit comments

Comments
 (0)