Buttonset: Added items option and removed visible filter for adding rounded corners...

diff --git a/tests/unit/button/button_tickets.js b/tests/unit/button/button_tickets.js
index 46002bdea7b9843e4519786694b3aecd81a319db..5c5053ded550e2c50ba60d99f327636dd1847208 100644 (file)
--- a/tests/unit/button/button_tickets.js
+++ b/tests/unit/button/button_tickets.js
@@ -1,15 +1,23 @@
 /*
  * button_tickets.js
  */
-(function($) {
+(function( $ ) {
 
-module("button: tickets");
+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)" ) );
+test( "#5946 - buttonset should ignore buttons that are not :visible", function() {
+       $( "#radio01" ).next().andSelf().hide();
+       var set = $( "#radio0" ).buttonset({ items: ":radio:visible" });
+       ok( set.find( "label:eq(0)" ).is( ":not(.ui-button):not(.ui-corner-left)" ) );
        ok( set.find( "label:eq(1)" ).is( ".ui-button.ui-corner-left" ) );
 });
 
-})(jQuery);
+test( "#6262 - buttonset not applying ui-corner to invisible elements", function() {
+       $( "#radio0" ).hide();
+       var set = $( "#radio0" ).buttonset();
+       ok( set.find( "label:eq(0)" ).is( ".ui-button.ui-corner-left" ) );
+       ok( set.find( "label:eq(1)" ).is( ".ui-button" ) );
+       ok( set.find( "label:eq(2)" ).is( ".ui-button.ui-corner-right" ) );
+});
+
+})( jQuery );

diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 912e45273416ec740b7bd73511831c1c80a0cc07..78134e30866e376ed4677406cce095768721319c 100644 (file)
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -315,6 +315,10 @@ $.widget( "ui.button", {
 });
 
 $.widget( "ui.buttonset", {
+       options: {
+               items: ":button, :submit, :reset, :checkbox, :radio, a, :data(button)"
+       },
+
        _create: function() {
                this.element.addClass( "ui-buttonset" );
        },
@@ -332,7 +336,7 @@ $.widget( "ui.buttonset", {
        },
        
        refresh: function() {
-               this.buttons = this.element.find( ":button, :submit, :reset, :checkbox, :radio, a, :data(button)" )
+               this.buttons = this.element.find( this.options.items )
                        .filter( ":ui-button" )
                                .button( "refresh" )
                        .end()
@@ -343,13 +347,11 @@ $.widget( "ui.buttonset", {
                                return $( this ).button( "widget" )[ 0 ];
                        })
                                .removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
-                               .filter( ":visible" )
-                                       .filter( ":first" )
-                                               .addClass( "ui-corner-left" )
-                                       .end()
-                                       .filter( ":last" )
-                                               .addClass( "ui-corner-right" )
-                                       .end()
+                               .filter( ":first" )
+                                       .addClass( "ui-corner-left" )
+                               .end()
+                               .filter( ":last" )
+                                       .addClass( "ui-corner-right" )
                                .end()
                        .end();
        },