From 17b6ff71dcea72504ee9ad217cb4d8bda1792a90 Mon Sep 17 00:00:00 2001 From: Felix Nagel Date: Mon, 29 Apr 2013 22:23:11 +0200 Subject: Selectmenu: use guard clause for option length checking in refresh --- ui/jquery.ui.selectmenu.js | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'ui/jquery.ui.selectmenu.js') diff --git a/ui/jquery.ui.selectmenu.js b/ui/jquery.ui.selectmenu.js index 756a09f90..a4af2986e 100644 --- a/ui/jquery.ui.selectmenu.js +++ b/ui/jquery.ui.selectmenu.js @@ -163,22 +163,25 @@ $.widget( "ui.selectmenu", { var item, options = this.element.find( "option" ); - if ( options.length ) { - this._readOptions( options ); - this._renderMenu( this.menu, this.items ); + + if ( !options.length ) { + return; + } + + this._readOptions( options ); + this._renderMenu( this.menu, this.items ); - this.menu.menu( "refresh" ); - this.menuItems = this.menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).find( "a" ); + this.menu.menu( "refresh" ); + this.menuItems = this.menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).find( "a" ); - item = this._getSelectedItem(); + item = this._getSelectedItem(); - // Make sure menu is selected item aware - this.menu.menu( "focus", null, item ); - this._setAria( item.data( "ui-selectmenu-item" ) ); + // Make sure menu is selected item aware + this.menu.menu( "focus", null, item ); + this._setAria( item.data( "ui-selectmenu-item" ) ); - // Set disabled state - this._setOption( "disabled", this._getCreateOptions().disabled ); - } + // Set disabled state + this._setOption( "disabled", this._getCreateOptions().disabled ); }, open: function( event ) { -- cgit v1.2.3