diff options
| author | Doug Neiner <doug@pixelgraphics.us> | 2011-05-12 01:16:06 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-05-12 20:48:55 -0400 |
| commit | 3842fa9f948283fa4bab9a99ad8d0a8a2adcc175 (patch) | |
| tree | 6dcfb9e76b497d3b89a6ed44997c5457cd45ba61 | |
| parent | 15cb56726f8b05be40dd7dc6590cef017cd8e953 (diff) | |
| download | jquery-ui-3842fa9f948283fa4bab9a99ad8d0a8a2adcc175.tar.gz jquery-ui-3842fa9f948283fa4bab9a99ad8d0a8a2adcc175.zip | |
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)
| -rw-r--r-- | ui/jquery.ui.button.js | 2 |
1 files changed, 2 insertions, 0 deletions
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(); }, |