diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2010-08-18 10:13:57 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2010-08-18 10:13:57 -0400 |
| commit | 9060bf3d09a547563e94815f9e0a1c4908ebd904 (patch) | |
| tree | 3f0a09b385c66c5203a5502576397b70c0d9f0c7 | |
| parent | 7692b6e65f27c9e37aaec45d92e120fbd43288d9 (diff) | |
| download | jquery-ui-9060bf3d09a547563e94815f9e0a1c4908ebd904.tar.gz jquery-ui-9060bf3d09a547563e94815f9e0a1c4908ebd904.zip | |
Buttonset: Ignore hidden buttons. Fixes #5946 - buttonset should ignore buttons that are not :visible.
| -rw-r--r-- | tests/unit/button/button_tickets.js | 7 | ||||
| -rw-r--r-- | ui/jquery.ui.button.js | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/tests/unit/button/button_tickets.js b/tests/unit/button/button_tickets.js index 7f972513d..46002bdea 100644 --- a/tests/unit/button/button_tickets.js +++ b/tests/unit/button/button_tickets.js @@ -5,6 +5,11 @@ module("button: tickets"); - +test("#5946 - buttonset should ignore buttons that are not :visible", function() { + $( "#radio01" ).next().wrap( "<div></div>" ).parent().hide(); + var set = $( "#radio0" ).buttonset(); + ok( set.find( "label:eq(0)" ).is( ".ui-button:not(.ui-corner-left)" ) ); + ok( set.find( "label:eq(1)" ).is( ".ui-button.ui-corner-left" ) ); +}); })(jQuery); diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js index b2fab4d24..7d21fa495 100644 --- a/ui/jquery.ui.button.js +++ b/ui/jquery.ui.button.js @@ -339,11 +339,13 @@ $.widget( "ui.buttonset", { return $( this ).button( "widget" )[ 0 ]; }) .removeClass( "ui-corner-all ui-corner-left ui-corner-right" ) - .filter( ":first" ) - .addClass( "ui-corner-left" ) - .end() - .filter( ":last" ) - .addClass( "ui-corner-right" ) + .filter( ":visible" ) + .filter( ":first" ) + .addClass( "ui-corner-left" ) + .end() + .filter( ":last" ) + .addClass( "ui-corner-right" ) + .end() .end() .end(); }, |