Skip to content

Selectmenu: Better handling when there are no options #1423

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: Better handling when there are no options #1423

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
14 changes: 14 additions & 0 deletions tests/unit/selectmenu/selectmenu_methods.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,20 @@ test( "refresh - disabled optgroup", function() {
}
});

test( "refresh - remove all options", function() {
expect( 2 );

var element = $( "#speed" ).selectmenu(),
button = element.selectmenu( "widget" ),
menu = element.selectmenu( "menuWidget" );

element.children().remove();
element.selectmenu( "refresh" );
equal( button.find( ".ui-selectmenu-text" ).html(), $( "<span>&#160;</span>" ).html(),
"Empty button text" );
equal( menu.children().length, 0, "Empty menu" );
});

test( "widget and menuWidget", function() {
expect( 4 );

Expand Down
27 changes: 19 additions & 8 deletions ui/selectmenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ return $.widget( "ui.selectmenu", {
this._drawButton();
this._drawMenu();

this._rendered = false;
this.menuItems = $();

if ( this.options.disabled ) {
this.disable();
}
Expand Down Expand Up @@ -119,7 +122,7 @@ return $.widget( "ui.selectmenu", {

// Delay rendering the menu items until the button receives focus.
// The menu may have already been rendered via a programmatic open.
if ( !that.menuItems ) {
if ( !that._rendered ) {
that._refreshMenu();
}
});
Expand Down Expand Up @@ -199,7 +202,8 @@ return $.widget( "ui.selectmenu", {
this._refreshMenu();
this.buttonItem.replaceWith(
this.buttonItem = this._renderButtonItem(
this._getSelectedItem().data( "ui-selectmenu-item" )
// Fall back to an empty object in case there are no options
Copy link
Member

Choose a reason for hiding this comment

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

Missing blank line above comment

this._getSelectedItem().data( "ui-selectmenu-item" ) || {}
)
);
if ( !this.options.width ) {
Expand All @@ -208,14 +212,10 @@ return $.widget( "ui.selectmenu", {
},

_refreshMenu: function() {
this.menu.empty();

var item,
options = this.element.find( "option" );

if ( !options.length ) {
return;
}
this.menu.empty();

this._parseOptions( options );
this._renderMenu( this.menu, this.items );
Expand All @@ -225,6 +225,12 @@ return $.widget( "ui.selectmenu", {
.not( ".ui-selectmenu-optgroup" )
.find( ".ui-menu-item-wrapper" );

this._rendered = true;

if ( !options.length ) {
return;
}

item = this._getSelectedItem();

// Update the menu to have the correct item focused
Expand All @@ -241,7 +247,7 @@ return $.widget( "ui.selectmenu", {
}

// If this is the first time the menu is being opened, render the items
if ( !this.menuItems ) {
if ( !this._rendered ) {
this._refreshMenu();
} else {

Expand All @@ -250,6 +256,11 @@ return $.widget( "ui.selectmenu", {
this.menuInstance.focus( null, this._getSelectedItem() );
}

// If there are no options, don't open the menu
if ( !this.menuItems.length ) {
return;
}

this.isOpen = true;
this._toggleAttr();
this._resizeMenu();
Expand Down