Button: Properly handle disabled option on init. Fixes #8028 - Gettin…

…g unset disabled option on button widget returns jQuery object, not default value. (cherry picked from commit 3a1031e) Conflicts: ui/jquery.ui.button.js
jquery · Jan 18, 2012 · f7f13b5 · f7f13b5
1 parent 94321ca
commit f7f13b5
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
@@ -56,7 +56,9 @@ $.widget( "ui.button", {
 			.bind( "reset.button", formResetHandler );
 
 		if ( typeof this.options.disabled !== "boolean" ) {
-			this.options.disabled = this.element.propAttr( "disabled" );
+			this.options.disabled = !!this.element.propAttr( "disabled" );
+		} else {
+			this.element.propAttr( "disabled", this.options.disabled );
 		}
 
 		this._determineButtonType();
@@ -72,10 +74,6 @@ $.widget( "ui.button", {
 			options.label = this.buttonElement.html();
 		}
 
-		if ( this.element.is( ":disabled" ) ) {
-			options.disabled = true;
-		}
-
 		this.buttonElement
 			.addClass( baseClasses )
 			.attr( "role", "button" )