Skip to content
Permalink
Browse files

Don't use :checkbox selector.

  • Loading branch information...
scottgonzalez committed May 21, 2012
1 parent 9ac52de commit e6f21410ff4e2e88ed5f44c872451e8030898178
Showing with 7 additions and 7 deletions.
  1. +5 −5 tests/unit/button/button_tickets.js
  2. +2 −2 ui/jquery.ui.button.js
@@ -30,23 +30,23 @@ test( "#6711 Checkbox/Radiobutton do not Show Focused State when using Keyboard

test( "#7092 - button creation that requires a matching label does not find label in all cases", function() {
var group = $( "<span><label for='t7092a'></label><input type='checkbox' id='t7092a'></span>" );
group.find( "input:checkbox" ).button();
group.find( "input[type=checkbox]" ).button();
ok( group.find( "label" ).is( ".ui-button" ) );

group = $( "<input type='checkbox' id='t7092b'><label for='t7092b'></label>" );
group.filter( "input:checkbox" ).button();
group.filter( "input[type=checkbox]" ).button();
ok( group.filter( "label" ).is( ".ui-button" ) );

group = $( "<span><input type='checkbox' id='t7092c'></span><label for='t7092c'></label>" );
group.find( "input:checkbox" ).button();
group.find( "input[type=checkbox]" ).button();
ok( group.filter( "label" ).is( ".ui-button" ) );

group = $( "<span><input type='checkbox' id='t7092d'></span><span><label for='t7092d'></label></span>" );
group.find( "input:checkbox" ).button();
group.find( "input[type=checkbox]" ).button();
ok( group.find( "label" ).is( ".ui-button" ) );

group = $( "<input type='checkbox' id='t7092e'><span><label for='t7092e'></label></span>" );
group.filter( "input:checkbox" ).button();
group.filter( "input[type=checkbox]" ).button();
ok( group.find( "label" ).is( ".ui-button" ) );
});

@@ -214,7 +214,7 @@ $.widget( "ui.button", {
_determineButtonType: function() {
var ancestor, labelSelector, checked;

if ( this.element.is(":checkbox") ) {
if ( this.element.is("[type=checkbox]") ) {
this.type = "checkbox";
} else if ( this.element.is("[type=radio]") ) {
this.type = "radio";
@@ -358,7 +358,7 @@ $.ui.button.version = "@VERSION";

$.widget( "ui.buttonset", {
options: {
items: ":button, :submit, :reset, :checkbox, [type=radio], a, :data(button)"
items: ":button, :submit, :reset, [type=checkbox], [type=radio], a, :data(button)"
},

_create: function() {

3 comments on commit e6f2141

@sobrinho

This comment has been minimized.

Copy link

replied May 22, 2012

@scottgonzalez what's the reason to stop using the sizzle selectors?

@scottgonzalez

This comment has been minimized.

Copy link
Member Author

replied May 22, 2012

They're discouraged when there are valid CSS selectors.

@sobrinho

This comment has been minimized.

Copy link

replied May 22, 2012

@scottgonzalez I see, thanks!

Please sign in to comment.
You can’t perform that action at this time.