Selectmenu: Implement new _addClass api

Author: arschmitz

ui/selectmenu.js

@@ -76,7 +76,8 @@ return $.widget( "ui.selectmenu", {
 	},
 
 	_drawButton: function() {
-		var that = this,
+		var icon,
+			that = this,
 			item = this._parseOption(
 				this.element.find( "option:selected" ),
 				this.element[ 0 ].selectedIndex
@@ -107,13 +108,12 @@ return $.widget( "ui.selectmenu", {
 		})
 			.insertAfter( this.element );
 
-		this._addClass( this.button, "ui-selectmenu-button ui-selectmenu-button-closed",
-			"ui-widget ui-state-default" );
+		this._addClass( this.button,
+			"ui-selectmenu-button ui-selectmenu-button-closed ui-widget ui-state-default" );
 
-		$( "<span>", {
-			"class": "ui-icon " + this.options.icons.button
-		})
-			.prependTo( this.button );
+		icon = $( "<span>" ).prependTo( this.button );
+
+		this._addClass( icon, "ui-icon " + this.options.icons.button );
 
 		this.buttonItem = this._renderButtonItem( item )
 			.appendTo( this.button );
@@ -146,13 +146,9 @@ return $.widget( "ui.selectmenu", {
 		});
 
 		// Wrap menu
-		this.menuWrap = $( "<div>", {
-			"class": "ui-selectmenu-menu ui-front"
-		})
-			.append( this.menu )
-			.appendTo( this._appendTo() );
+		this.menuWrap = $( "<div>" ).append( this.menu ).appendTo( this._appendTo() );
 
-		this._addClass( this.menuWrap, "ui-selectmenu-menu", "ui-front" );
+		this._addClass( this.menuWrap, "ui-selectmenu-menu ui-front" );
 
 		// Initialize menu widget
 		this.menuInstance = this.menu
@@ -255,7 +251,7 @@ return $.widget( "ui.selectmenu", {
 		} else {
 
 			// Menu clears focus on close, reset focus to selected item
-			this.menu.find( ".ui-state-focus" ).removeClass( "ui-state-focus" );
+			this._removeClass( this.menu.find( ".ui-state-focus" ), "ui-state-focus" );
 			this.menuInstance.focus( null, this._getSelectedItem() );
 		}
 
@@ -313,7 +309,7 @@ return $.widget( "ui.selectmenu", {
 					text: item.optgroup
 				}).appendTo( ul );
 
-				that._addClass( li, "ui-selectmenu-optgroup", "ui-menu-divider" +
+				that._addClass( li, "ui-selectmenu-optgroup ui-menu-divider" +
 					( item.element.parent( "optgroup" ).prop( "disabled" ) ?
 						" ui-state-disabled" : "" ) );
 
@@ -335,7 +331,7 @@ return $.widget( "ui.selectmenu", {
 			});
 
 		if ( item.disabled ) {
-			li.addClass( "ui-state-disabled" );
+			this._addClass( li, "ui-state-disabled" );
 		}
 		this._setText( wrapper, item.label );
 
@@ -533,9 +529,10 @@ return $.widget( "ui.selectmenu", {
 
 	_setOption: function( key, value ) {
 		if ( key === "icons" ) {
-			this.button.find( "span.ui-icon" )
-				.removeClass( this.options.icons.button )
-				.addClass( value.button );
+			var icon = this.button.find( "span.ui-icon" );
+
+			this._removeClass( icon, this.options.icons.button );
+			this._addClass( icon, value.button );
 		}
 
 		this._super( key, value );
@@ -546,9 +543,8 @@ return $.widget( "ui.selectmenu", {
 
 		if ( key === "disabled" ) {
 			this.menuInstance.option( "disabled", value );
-			this.button
-				.toggleClass( "ui-state-disabled", value )
-				.attr( "aria-disabled", value );
+			this.button.attr( "aria-disabled", value );
+			this[ ( value ? "_add" : "_remove" ) + "Class" ]( "ui-state-disabled", value );
 
 			this.element.prop( "disabled", value );
 			if ( value ) {
@@ -585,10 +581,7 @@ return $.widget( "ui.selectmenu", {
 	},
 
 	_toggleAttr: function() {
-		this.button
-			.toggleClass( "ui-corner-top", this.isOpen )
-			.toggleClass( "ui-corner-all", !this.isOpen )
-			.attr( "aria-expanded", this.isOpen );
+		this.button.attr( "aria-expanded", this.isOpen );
 
 		this[ ( !this.isOpen ? "_add" : "_remove" ) + "Class" ]
 			( this.button, "ui-selectmenu-button-closed" );