diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-11-10 01:40:05 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-11-10 01:40:05 +0100 |
| commit | 7ce8e0515ea7cc513c3c065946c85cf2d1aa5652 (patch) | |
| tree | a0337f9f7d8d0d27a7cdb78a63ee152d8357b32f /ui/jquery.ui.button.js | |
| parent | 94b3a65c66e338fc6f697d13fc77d7f19b8666ae (diff) | |
| parent | d6c6b7dc3381432f50212b4f458931b2521ecb56 (diff) | |
| download | jquery-ui-7ce8e0515ea7cc513c3c065946c85cf2d1aa5652.tar.gz jquery-ui-7ce8e0515ea7cc513c3c065946c85cf2d1aa5652.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.button.js')
| -rw-r--r-- | ui/jquery.ui.button.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js index 5ae526488..6d7b94a38 100644 --- a/ui/jquery.ui.button.js +++ b/ui/jquery.ui.button.js @@ -282,7 +282,7 @@ $.widget( "ui.button", { }, refresh: function() { - var isDisabled = this.element.is( ":disabled" ); + var isDisabled = this.element.is( ":disabled" ) || this.element.hasClass( "ui-button-disabled" ); if ( isDisabled !== this.options.disabled ) { this._setOption( "disabled", isDisabled ); } @@ -358,7 +358,7 @@ $.widget( "ui.button", { $.widget( "ui.buttonset", { version: "@VERSION", options: { - items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(button)" + items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)" }, _create: function() { |