From f7f13b5949cd59f4e3f70c315d4e18f9662281ad Mon Sep 17 00:00:00 2001
From: =?utf8?q?Scott=20Gonz=C3=A1lez?= <scott.gonzalez@gmail.com>
Date: Wed, 18 Jan 2012 16:39:41 -0500
Subject: [PATCH] Button: Properly handle disabled option on init. Fixes #8028
 - Getting unset disabled option on button widget returns jQuery object, not
 default value. (cherry picked from commit
 3a1031e58b717b042d39dcccfdbe1d293cdbecf1)

Conflicts:

	ui/jquery.ui.button.js
---
 ui/jquery.ui.button.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 31074e2e1..334ff8cbe 100644
--- 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" )
-- 
2.39.5