diff options
| author | TJ VanToll <tj.vantoll@gmail.com> | 2012-10-16 13:20:55 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-10-16 23:09:26 -0400 |
| commit | 5e24a1ce4b337830b37511305a6ddefe797fd40c (patch) | |
| tree | af80b9c56a0e71e8e125b3061413b87a54ced01d | |
| parent | 8ce35198daf261370e2962f4c429bf4fa998b2df (diff) | |
| download | jquery-ui-5e24a1ce4b337830b37511305a6ddefe797fd40c.tar.gz jquery-ui-5e24a1ce4b337830b37511305a6ddefe797fd40c.zip | |
Button: Check for ui-state-disabled during refresh. Fixes #8237 - Button: Anchor tags cannot be disabled within buttonset.
| -rw-r--r-- | tests/unit/button/button_tickets.js | 8 | ||||
| -rw-r--r-- | ui/jquery.ui.button.js | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/unit/button/button_tickets.js b/tests/unit/button/button_tickets.js index 846ca7ef4..eb70181ec 100644 --- a/tests/unit/button/button_tickets.js +++ b/tests/unit/button/button_tickets.js @@ -61,4 +61,12 @@ test( "#7534 - Button label selector works for ids with \":\"", function() { ok( group.find( "label" ).is( ".ui-button" ), "Found an id with a :" ); }); +test( "#8237 - Anchor tags lose disabled state when refreshed", function() { + expect( 1 ); + var element = $( "<a id='a8237'></a>" ).appendTo( "#qunit-fixture" ); + + element.button({ disabled: true }).button( "refresh" ); + ok( element.button( "option", "disabled" ), "Anchor button should remain disabled after refresh" ); +}); + })( jQuery ); diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js index 5ae526488..f253464df 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 ); } |