aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.button.js
diff options
context:
space:
mode:
authorDoug Neiner <doug@pixelgraphics.us>2011-05-12 01:16:06 -0400
committerDoug Neiner <doug@pixelgraphics.us>2011-05-12 01:16:06 -0400
commit8df834f68c4337cb6d128360c76a4621f050bd60 (patch)
tree1385cfc9db9aa086ab85a7203a8b64865473634f /ui/jquery.ui.button.js
parentc89bbc1839ec7bcbb2834dc2a148bade2a538217 (diff)
downloadjquery-ui-8df834f68c4337cb6d128360c76a4621f050bd60.tar.gz
jquery-ui-8df834f68c4337cb6d128360c76a4621f050bd60.zip
Button: no longer calls _resetButton() after changing the disabled option. Fixed #6242 - Button .enable() strange behavior on Webkit (Google Chrome, Safari)
Diffstat (limited to 'ui/jquery.ui.button.js')
-rw-r--r--ui/jquery.ui.button.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 031ac2091..a120f884f 100644
--- 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();
},