Button: no longer calls _resetButton() after changing the disabled option. Fixed...

(cherry picked from commit 8df834f68c4337cb6d128360c76a4621f050bd60)

diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 19b1b416945461504d156750e3c87af5858598f6..a1be75d8e021b556541068295d65a2c397bf201d 100644 (file)
--- 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();
        },