diff options
author | Simen Bekkhus <sbekkhus91@gmail.com> | 2014-08-29 14:18:47 +0200 |
---|---|---|
committer | Scott González <scott.gonzalez@gmail.com> | 2014-09-29 14:36:46 -0400 |
commit | e3e5a9ffa647937d2dd458114e27e04f56bd47d0 (patch) | |
tree | 7d1723c35f7fe694f77f1bd74ffcf99b1607e267 /ui | |
parent | b20387ab366aba3428dbd54196a74c0b2eb6ea70 (diff) | |
download | jquery-ui-e3e5a9ffa647937d2dd458114e27e04f56bd47d0.tar.gz jquery-ui-e3e5a9ffa647937d2dd458114e27e04f56bd47d0.zip |
Menu: Filter out non-items when typing
Fixes #10571
Closes gh-1329
Diffstat (limited to 'ui')
-rw-r--r-- | ui/menu.js | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/ui/menu.js b/ui/menu.js index 4dfa0d37a..9664e37ef 100644 --- a/ui/menu.js +++ b/ui/menu.js @@ -186,13 +186,9 @@ return $.widget( "ui.menu", { }, _keydown: function( event ) { - var match, prev, character, skip, regex, + var match, prev, character, skip, preventDefault = true; - function escape( value ) { - return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ); - } - switch ( event.keyCode ) { case $.ui.keyCode.PAGE_UP: this.previousPage( event ); @@ -241,10 +237,7 @@ return $.widget( "ui.menu", { character = prev + character; } - regex = new RegExp( "^" + escape( character ), "i" ); - match = this.activeMenu.find( this.options.items ).filter(function() { - return regex.test( $( this ).text() ); - }); + match = this._filterMenuItems( character ); match = skip && match.index( this.active.next() ) !== -1 ? this.active.nextAll( ".ui-menu-item" ) : match; @@ -253,10 +246,7 @@ return $.widget( "ui.menu", { // to move down the menu to the first item that starts with that character if ( !match.length ) { character = String.fromCharCode( event.keyCode ); - regex = new RegExp( "^" + escape( character ), "i" ); - match = this.activeMenu.find( this.options.items ).filter(function() { - return regex.test( $( this ).text() ); - }); + match = this._filterMenuItems( character ); } if ( match.length ) { @@ -640,6 +630,20 @@ return $.widget( "ui.menu", { this.collapseAll( event, true ); } this._trigger( "select", event, ui ); + }, + + _filterMenuItems: function(character) { + var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ), + regex = new RegExp( "^" + escapedCharacter, "i" ); + + return this.activeMenu + .find( this.options.items ) + + // Only match on items, not dividers or other content (#10571) + .filter( ".ui-menu-item" ) + .filter(function() { + return regex.test( $( this ).text() ); + }); } }); |