aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorTJ VanToll <tj.vantoll@gmail.com>2012-11-19 15:42:28 -0500
committerMike Sherov <mike.sherov@gmail.com>2012-11-21 19:24:24 -0500
commit93abe02b6052143fac30393291da3fc254bde996 (patch)
treea74a4d77933f392f6116a21d47594291ad3fbc50 /ui
parentcb748b4a6f32aa5748d6777e7871c96f70ad2207 (diff)
downloadjquery-ui-93abe02b6052143fac30393291da3fc254bde996.tar.gz
jquery-ui-93abe02b6052143fac30393291da3fc254bde996.zip
Button: Fixing handling of the disabled options on refresh method calls. Fixed #8828 - Button: Refresh does not re-enable disabled button.
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.button.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 3decc2331..b80fca4d9 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -284,7 +284,9 @@ $.widget( "ui.button", {
},
refresh: function() {
- var isDisabled = this.element.is( ":disabled" ) || this.element.hasClass( "ui-button-disabled" );
+ //See #8237 & #8828
+ var isDisabled = this.element.is( "input, button" ) ? this.element.is( ":disabled" ) : this.element.hasClass( "ui-button-disabled" );
+
if ( isDisabled !== this.options.disabled ) {
this._setOption( "disabled", isDisabled );
}