Permalink
Browse files

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
  • Loading branch information...
scottgonzalez committed Jan 18, 2012
1 parent 94321ca commit f7f13b5949cd59f4e3f70c315d4e18f9662281ad
Showing with 3 additions and 5 deletions.
  1. +3 −5 ui/jquery.ui.button.js
View
@@ -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" )

0 comments on commit f7f13b5

Please sign in to comment.