From 3a1031e58b717b042d39dcccfdbe1d293cdbecf1 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 18 Jan 2012 16:37:04 -0500
Subject: Button: Properly handle disabled option on init. Fixes #8028 -
 Getting unset disabled option on button widget returns jQuery object, not
 default value.

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

(limited to 'ui')

diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 18a950563..1c3cf2c64 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -58,7 +58,9 @@ $.widget( "ui.button", {
 			.bind( "reset.button", formResetHandler );
 
 		if ( typeof this.options.disabled !== "boolean" ) {
-			this.options.disabled = this.element.prop( "disabled" );
+			this.options.disabled = !!this.element.prop( "disabled" );
+		} else {
+			this.element.prop( "disabled", this.options.disabled );
 		}
 
 		this._determineButtonType();
@@ -74,10 +76,6 @@ $.widget( "ui.button", {
 			options.label = this.buttonElement.html();
 		}
 
-		if ( this.element.is( ":disabled" ) ) {
-			options.disabled = true;
-		}
-
 		this.buttonElement
 			.addClass( baseClasses )
 			.attr( "role", "button" )
-- 
cgit v1.2.3