Skip to content
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.
  • Loading branch information
scottgonzalez committed Jan 18, 2012
1 parent eee63a2 commit 3a1031e58b717b042d39dcccfdbe1d293cdbecf1
Showing with 3 additions and 5 deletions.
  1. +3 −5 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" )

0 comments on commit 3a1031e

Please sign in to comment.
You can’t perform that action at this time.