From: Doug Neiner <doug@pixelgraphics.us>
Date: Thu, 12 May 2011 05:16:06 +0000 (-0400)
Subject: Button: no longer calls _resetButton() after changing the disabled option. Fixed... 
X-Git-Tag: 1.8.14~25
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3842fa9f948283fa4bab9a99ad8d0a8a2adcc175;p=jquery-ui.git

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

diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 19b1b4169..a1be75d8e 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -184,6 +184,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() {
@@ -251,6 +252,7 @@ $.widget( "ui.button", {
 			} else {
 				this.element.removeAttr( "disabled" );
 			}
+			return;
 		}
 		this._resetButton();
 	},