Button: no longer calls _resetButton() after changing the disabled option. Fixed #6242 - Button .enable() strange behavior on Webkit (Google Chrome, Safari)

dcneiner · dcneiner · commit 8df834f68c43 · 2011-05-12T01:16:06.000-04:00
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
@@ -185,6 +185,7 @@ $.widget( "ui.button", {
 		// $.Widget.prototype._setOptionDisabled so it's easy to proxy and can
 		// be overridden by individual plugins
 		this._setOption( "disabled", options.disabled );
+		this._resetButton();
 	},
 
 	_determineButtonType: function() {
@@ -250,6 +251,7 @@ $.widget( "ui.button", {
 			} else {
 				this.element.removeAttr( "disabled" );
 			}
+			return;
 		}
 		this._resetButton();
 	},

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ $.widget( "ui.button", {`
`185`	`185`	`// $.Widget.prototype._setOptionDisabled so it's easy to proxy and can`
`186`	`186`	`// be overridden by individual plugins`
`187`	`187`	`this._setOption( "disabled", options.disabled );`
	`188`	`+ this._resetButton();`
`188`	`189`	`},`
`189`	`190`
`190`	`191`	`_determineButtonType: function() {`
`@@ -250,6 +251,7 @@ $.widget( "ui.button", {`
`250`	`251`	`} else {`
`251`	`252`	`this.element.removeAttr( "disabled" );`
`252`	`253`	`}`
	`254`	`+ return;`
`253`	`255`	`}`
`254`	`256`	`this._resetButton();`
`255`	`257`	`},`