deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Made sure that the .val() logic for setting radios and checkboxes was correct. Fixes #5698.

Browse source
This commit is contained in:
jeresig 2009-12-22 01:18:49 -05:00
parent 261b7efb5f
commit f298cce100
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/attributes.js
View file

@ -158,7 +158,7 @@ jQuery.fn.extend({
} }
if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) ) { if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) ) {
this.checked = jQuery.inArray(this.value || this.name, val) >= 0; this.checked = jQuery.inArray( this.value, val ) >= 0;
} else if ( jQuery.nodeName( this, "select" ) ) { } else if ( jQuery.nodeName( this, "select" ) ) {
var values = jQuery.makeArray(val); var values = jQuery.makeArray(val);

18
test/unit/manipulation.js
View file

@ -619,7 +619,7 @@ test("clone() on XML nodes", function() {
} }
test("val()", function() { test("val()", function() {
expect(11); expect(15);
document.getElementById('text1').value = "bla"; document.getElementById('text1').value = "bla";
equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" ); equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
@ -646,6 +646,22 @@ test("val()", function() {
jQuery('#select3').val(""); jQuery('#select3').val("");
same( jQuery('#select3').val(), [''], 'Call val() on a multiple="multiple" select' ); same( jQuery('#select3').val(), [''], 'Call val() on a multiple="multiple" select' );
var checks = jQuery("<input type='checkbox' name='test' value='1'/>").appendTo("#form")
.add( jQuery("<input type='checkbox' name='test' value='2'/>").appendTo("#form") )
.add( jQuery("<input type='checkbox' name='test' value=''/>").appendTo("#form") );
same( checks.serialize(), "", "Get unchecked values." );
checks.val([ "2" ]);
same( checks.serialize(), "test=2", "Get a single checked value." );
checks.val([ "1", "" ]);
same( checks.serialize(), "test=1&test=", "Get multiple checked values." );
checks.val([ "", "2" ]);
same( checks.serialize(), "test=2&test=", "Get multiple checked values." );
checks.remove();
}); });
var testVal = function(valueObj) { var testVal = function(valueObj) {