Skip to content

[WIP] Checkboxradio: Properly find radio groups from the associated form #1631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[WIP] Checkboxradio: Properly find radio groups from the associated form #1631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67c59ec
Checkboxradio: Properly find radio groups from the associated form
scottgonzalez Oct 27, 2015
5fcb55a
fixup: Add input to selector
scottgonzalez Oct 28, 2015
c58b94f
fixup: Add test
scottgonzalez Oct 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions tests/unit/checkboxradio/checkboxradio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@
<label>
<input type="checkbox" id="label-with-no-for"/>
</label>

<form id="form3"></form>
<input type="radio" name="crazy-form" id="crazy-form-1" form="form3" checked="checked">
<label for="crazy-form-1">Choice 1</label>
<input type="radio" name="crazy-form" id="crazy-form-2" form="form3">
<label for="crazy-form-2">Choice 2</label>

</div>
</body>
</html>
19 changes: 19 additions & 0 deletions tests/unit/checkboxradio/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,25 @@ asyncTest( "Ensure checked after single click on checkbox label button", functio
} );
} );

test( "Handle form association via form attribute", function( assert ) {
expect( 4 );

var radio1 = $( "#crazy-form-1" ).checkboxradio();
var radio1Label = radio1.checkboxradio( "widget" );
var radio2 = $( "#crazy-form-2" ).checkboxradio();
var radio2Label = radio2.checkboxradio( "widget" );

radio2.change( function() {
ok( this.checked, "#2 checked" );
ok( !radio1[ 0 ].checked, "#1 not checked" );

assert.hasClasses( radio2Label, "ui-state-active" );
assert.lacksClasses( radio1Label, "ui-state-active" );
} );

radio2Label.simulate( "click" );
} );

test( "Checkbox creation requires a label, and finds it in all cases", function( assert ) {
expect( 7 );
var groups = [
Expand Down
21 changes: 13 additions & 8 deletions ui/widgets/checkboxradio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {

this._bindFormResetHandler();

// this.form is set by the form-reset-mixin
this.formParent = this.form.length ? this.form : $( "body" );

if ( this.options.disabled == null ) {
this.options.disabled = this.element[ 0 ].disabled;
}
Expand Down Expand Up @@ -151,17 +148,25 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
},

_getRadioGroup: function() {
var group;
var name = this.element[ 0 ].name;
var formParent = this.formParent[ 0 ];
var nameSelector = "input[name='" + $.ui.escapeSelector( name ) + "']";

if ( !name ) {
return $( [] );
}

return this.formParent.find( "[name='" + $.ui.escapeSelector( name ) + "']" ).filter( function() {
var form = $( this ).form();
return ( form.length ? form : $( "body" ) )[ 0 ] === formParent;
} ).not( this.element );
if ( this.form.length ) {
group = $( this.form[ 0 ].elements ).filter( nameSelector );
} else {

// Not inside a form, check all inputs that also are not inside a form
group = $( nameSelector ).filter( function() {
return $( this ).form().length === 0;
} );
}

return group.not( this.element );
},

_toggleClasses: function() {
Expand Down