Selectmenu: use guard clause for option length checking in refresh

jquery · Apr 29, 2013 · 17b6ff7 · 17b6ff7
1 parent ee9c443
commit 17b6ff7
Showing 1 changed file with 15 additions and 12 deletions.
diff --git 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 );
+		if ( !options.length ) {
-			this._renderMenu( this.menu, this.items );
+			return;
+		}
+
+		this._readOptions( options );
+		this._renderMenu( this.menu, this.items );
 
-			this.menu.menu( "refresh" );
+		this.menu.menu( "refresh" );
-			this.menuItems = this.menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).find( "a" );
+		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
+		// Make sure menu is selected item aware
-			this.menu.menu( "focus", null, item );
+		this.menu.menu( "focus", null, item );
-			this._setAria( item.data( "ui-selectmenu-item" ) );
+		this._setAria( item.data( "ui-selectmenu-item" ) );
 
-			// Set disabled state
+		// Set disabled state
-			this._setOption( "disabled", this._getCreateOptions().disabled );
+		this._setOption( "disabled", this._getCreateOptions().disabled );
-		}
 	},
 
 	open: function( event ) {