Skip to content

Selectmenu: Prevent exception when the user types in selectmenu, when the result is an optgroup #1329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Selectmenu: Prevent exception when the user types in selectmenu, when the result is an optgroup #1329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions tests/unit/menu/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,15 @@
<li>Amesville</li>
</ul>

<ul id="menu8">
<li class="foo">Aberdeen</li>
<li class="foo ui-state-disabled">Ada</li>
<li class="foo">Adamsville</li>
<li class="foo">Addyston</li>
<li class="foo">-</li>
<li class="foo">-Saarland</li>
</ul>

</div>
</body>
</html>
19 changes: 19 additions & 0 deletions tests/unit/menu/menu_events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,4 +644,23 @@ test( "#9469: Stopping propagation in a select event should not suppress subsequ
equal( logOutput(), "1,2", "Both select events were not triggered." );
});

asyncTest( "#10571: When typing in a menu, only menu-items should be focused on", function() {
expect( 3 );

var element = $( "#menu8" );

element.menu({
focus: function( event, ui ) {
equal( ui.item.length, 1, "There should only be one match when filtering" );
ok( ui.item.hasClass( "ui-menu-item" ), "element is .ui-menu-item" );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should verify that the correct element is provided, not just that it's a menu item.

equal( ui.item.text(), "-Saarland", "element has correct text" );
}
});

setTimeout(function() {
element.menu( "widget" ).simulate( "keydown", { keyCode: "-".charCodeAt( 0 ) } );
start();
});
});

})( jQuery );
30 changes: 17 additions & 13 deletions ui/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -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;
Expand All @@ -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 ) {
Expand Down Expand Up @@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blank line above comment.

.filter( ".ui-menu-item" )
.filter(function() {
return regex.test( $( this ).text() );
});
}
});

Expand Down