tests/unit/tabs/options.js

@@ -185,7 +185,7 @@ test( "disabled", function( assert ) {
 	disabled( element, true );
 
 	assert.lacksClasses( element.tabs( "widget" ), "ui-state-disabled" );
-	assert.lacksClasses( element.tabs( "widget" ), "ui-tabs-disabled" );
+	assert.hasClasses( element.tabs( "widget" ), "ui-tabs-disabled" );
 	ok( !element.tabs( "widget" ).attr( "aria-disabled" ), "after: wrapper doesn't have aria-disabled attr" );
 
 	event = $.Event( "click" );

tests/unit/widget/core.js

@@ -729,6 +729,39 @@ test( ".disable()", function() {
 	$( "<div>" ).testWidget().testWidget( "disable" );
 } );
 
+test( "._setOptionDisabled()", function() {
+	expect( 3 );
+
+	var method;
+	var widget;
+
+	$.widget( "ui.testWidget", {
+		_setOptionDisabled: function( value ) {
+			method( value );
+		}
+	} );
+
+	method = function() {
+		ok( false, "._setOptionDisabled() called on init when not disabled" );
+	};
+	$( "<div>" ).testWidget();
+
+	method = function( value ) {
+		strictEqual( value, true, "._setOptionDisabled called on init when disabled" );
+	};
+	widget = $( "<div>" ).testWidget( { disabled: true } );
+
+	method = function( value ) {
+		strictEqual( value, false, "._setOptionDisabled called when enabling" );
+	};
+	widget.testWidget( "enable" );
+
+	method = function( value ) {
+		strictEqual( value, true, "._setOptionDisabled called when disabling" );
+	};
+	widget.testWidget( "option", "disabled", true );
+} );
+
 test( ".widget() - base", function() {
 	expect( 2 );
 	var constructor = $.widget( "ui.testWidget", {

ui/widget.js

@@ -318,6 +318,11 @@ $.Widget.prototype = {
 			options );
 
 		this._create();
+
+		if ( this.options.disabled ) {
+			this._setOptionDisabled( this.options.disabled );
+		}
+
 		this._trigger( "create", null, this._getCreateEventData() );
 		this._init();
 	},
@@ -419,13 +424,7 @@ $.Widget.prototype = {
 		this.options[ key ] = value;
 
 		if ( key === "disabled" ) {
-			this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null, !!value );
-
-			// If the widget is becoming disabled, then nothing is interactive
-			if ( value ) {
-				this._removeClass( this.hoverable, null, "ui-state-hover" );
-				this._removeClass( this.focusable, null, "ui-state-focus" );
-			}
+			this._setOptionDisabled( value );
 		}
 
 		return this;
@@ -462,6 +461,16 @@ $.Widget.prototype = {
 		}
 	},
 
+	_setOptionDisabled: function( value ) {
+		this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null, !!value );
+
+		// If the widget is becoming disabled, then nothing is interactive
+		if ( value ) {
+			this._removeClass( this.hoverable, null, "ui-state-hover" );
+			this._removeClass( this.focusable, null, "ui-state-focus" );
+		}
+	},
+
 	enable: function() {
 		return this._setOptions( { disabled: false } );
 	},

ui/widgets/accordion.js

@@ -174,17 +174,19 @@ return $.widget( "ui.accordion", {
 				this._createIcons();
 			}
 		}
+	},
+
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this.element.attr( "aria-disabled", value );
 
 		// Support: IE8 Only
 		// #5332 / #6059 - opacity doesn't cascade to positioned elements in IE
 		// so we need to add the disabled class to the headers and panels
-		if ( key === "disabled" ) {
-			this.element.attr( "aria-disabled", value );
-
-			this._toggleClass( null, "ui-state-disabled", !!value );
-			this._toggleClass( this.headers.add( this.headers.next() ), null, "ui-state-disabled",
-				!!value );
-		}
+		this._toggleClass( null, "ui-state-disabled", !!value );
+		this._toggleClass( this.headers.add( this.headers.next() ), null, "ui-state-disabled",
+			!!value );
 	},
 
 	_keydown: function( event ) {

ui/widgets/dialog.js

@@ -129,6 +129,11 @@ $.widget( "ui.dialog", {
 			this.options.title = this.originalTitle;
 		}
 
+		// Dialogs can't be disabled
+		if ( this.options.disabled ) {
+			this.options.disabled = false;
+		}
+
 		this._createWrapper();
 
 		this.element

ui/widgets/draggable.js

@@ -78,9 +78,6 @@ $.widget( "ui.draggable", $.ui.mouse, {
 		if ( this.options.addClasses ) {
 			this._addClass( "ui-draggable" );
 		}
-		if ( this.options.disabled ) {
-			this._addClass( "ui-draggable-disabled" );
-		}
 		this._setHandleClassName();
 
 		this._mouseInit();

ui/widgets/menu.js

@@ -71,11 +71,6 @@ return $.widget( "ui.menu", {
 				tabIndex: 0
 			} );
 
-		if ( this.options.disabled ) {
-			this._addClass( null, "ui-state-disabled" );
-			this.element.attr( "aria-disabled", "true" );
-		}
-
 		this._addClass( "ui-menu", "ui-widget ui-widget-content" );
 		this._on( {
 
@@ -359,13 +354,16 @@ return $.widget( "ui.menu", {
 			this._removeClass( icons, null, this.options.icons.submenu )
 				._addClass( icons, null, value.submenu );
 		}
-		if ( key === "disabled" ) {
-			this.element.attr( "aria-disabled", value );
-			this._toggleClass( null, "ui-state-disabled", !!value );
-		}
 		this._super( key, value );
 	},
 
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this.element.attr( "aria-disabled", String( value ) );
+		this._toggleClass( null, "ui-state-disabled", !!value );
+	},
+
 	focus: function( event, item ) {
 		var nested, focused, activeParent;
 		this.blur( event, event && event.type === "focus" );

ui/widgets/progressbar.js

@@ -117,13 +117,16 @@ return $.widget( "ui.progressbar", {
 			// Don't allow a max less than min
 			value = Math.max( this.min, value );
 		}
-		if ( key === "disabled" ) {
-			this.element.attr( "aria-disabled", value );
-			this._toggleClass( null, "ui-state-disabled", !!value );
-		}
 		this._super( key, value );
 	},
 
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this.element.attr( "aria-disabled", value );
+		this._toggleClass( null, "ui-state-disabled", !!value );
+	},
+
 	_percentage: function() {
 		return this.indeterminate ? 100 : 100 * ( this.options.value - this.min ) / ( this.options.max - this.min );
 	},

ui/widgets/selectmenu.js

@@ -79,10 +79,6 @@ return $.widget( "ui.selectmenu", {
 
 		this._rendered = false;
 		this.menuItems = $();
-
-		if ( this.options.disabled ) {
-			this.disable();
-		}
 	},
 
 	_drawButton: function() {
@@ -562,25 +558,27 @@ return $.widget( "ui.selectmenu", {
 			this.menuWrap.appendTo( this._appendTo() );
 		}
 
-		if ( key === "disabled" ) {
-			this.menuInstance.option( "disabled", value );
-			this.button.attr( "aria-disabled", value );
-			this._toggleClass( this.button, null, "ui-state-disabled", value );
-
-			this.element.prop( "disabled", value );
-			if ( value ) {
-				this.button.attr( "tabindex", -1 );
-				this.close();
-			} else {
-				this.button.attr( "tabindex", 0 );
-			}
-		}
-
 		if ( key === "width" ) {
 			this._resizeButton();
 		}
 	},
 
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this.menuInstance.option( "disabled", value );
+		this.button.attr( "aria-disabled", value );
+		this._toggleClass( this.button, null, "ui-state-disabled", value );
+
+		this.element.prop( "disabled", value );
+		if ( value ) {
+			this.button.attr( "tabindex", -1 );
+			this.close();
+		} else {
+			this.button.attr( "tabindex", 0 );
+		}
+	},
+
 	_appendTo: function() {
 		var element = this.options.appendTo;
 

ui/widgets/slider.js

@@ -81,7 +81,6 @@ return $.widget( "ui.slider", $.ui.mouse, {
 			"ui-widget ui-widget-content" );
 
 		this._refresh();
-		this._setOption( "disabled", this.options.disabled );
 
 		this._animateOff = false;
 	},
@@ -430,10 +429,6 @@ return $.widget( "ui.slider", $.ui.mouse, {
 			valsLength = this.options.values.length;
 		}
 
-		if ( key === "disabled" ) {
-			this._toggleClass( null, "ui-state-disabled", !!value );
-		}
-
 		this._super( key, value );
 
 		switch ( key ) {
@@ -481,6 +476,12 @@ return $.widget( "ui.slider", $.ui.mouse, {
 		}
 	},
 
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this._toggleClass( null, "ui-state-disabled", !!value );
+	},
+
 	//internal value getter
 	// _value() returns value trimmed by min and max, aligned by step
 	_value: function() {

ui/widgets/spinner.js

@@ -268,11 +268,6 @@ $.widget( "ui.spinner", {
 				this.uiSpinner.height() > 0 ) {
 			this.uiSpinner.height( this.uiSpinner.height() );
 		}
-
-		// Disable spinner if element was already disabled
-		if ( this.options.disabled ) {
-			this.disable();
-		}
 	},
 
 	_keydown: function( event ) {
@@ -427,12 +422,14 @@ $.widget( "ui.spinner", {
 		}
 
 		this._super( key, value );
+	},
 
-		if ( key === "disabled" ) {
-			this._toggleClass( this.uiSpinner, null, "ui-state-disabled", !!value );
-			this.element.prop( "disabled", !!value );
-			this.buttons.button( value ? "disable" : "enable" );
-		}
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this._toggleClass( this.uiSpinner, null, "ui-state-disabled", !!value );
+		this.element.prop( "disabled", !!value );
+		this.buttons.button( value ? "disable" : "enable" );
 	},
 
 	_setOptions: spinnerModifer( function( options ) {

ui/widgets/tabs.js

@@ -291,13 +291,6 @@ $.widget( "ui.tabs", {
 			return;
 		}
 
-		if ( key === "disabled" ) {
-
-			// don't use the widget factory's disabled handling
-			this._setupDisabled( value );
-			return;
-		}
-
 		this._super( key, value );
 
 		if ( key === "collapsible" ) {
@@ -363,7 +356,7 @@ $.widget( "ui.tabs", {
 	},
 
 	_refresh: function() {
-		this._setupDisabled( this.options.disabled );
+		this._setOptionDisabled( this.options.disabled );
 		this._setupEvents( this.options.event );
 		this._setupHeightStyle( this.options.heightStyle );
 
@@ -507,7 +500,7 @@ $.widget( "ui.tabs", {
 			.data( "ui-tabs-destroy", true );
 	},
 
-	_setupDisabled: function( disabled ) {
+	_setOptionDisabled: function( disabled ) {
 		var currentItem, li, i;
 
 		if ( $.isArray( disabled ) ) {
@@ -531,6 +524,9 @@ $.widget( "ui.tabs", {
 		}
 
 		this.options.disabled = disabled;
+
+		this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null,
+			disabled === true );
 	},
 
 	_setupEvents: function( event ) {
@@ -804,7 +800,7 @@ $.widget( "ui.tabs", {
 				} );
 			}
 		}
-		this._setupDisabled( disabled );
+		this._setOptionDisabled( disabled );
 	},
 
 	disable: function( index ) {
@@ -826,7 +822,7 @@ $.widget( "ui.tabs", {
 				disabled = [ index ];
 			}
 		}
-		this._setupDisabled( disabled );
+		this._setOptionDisabled( disabled );
 	},
 
 	load: function( index, event ) {