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 a612d1982823843c890b709e64487e7ed1cf74d9..7fc2119cb16f192fc33091db3c23d3af07f35b5d 100644 (file)
--- 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 );
                }
        },