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

diff --git a/src/attributes.js b/src/attributes.js
index 91a0fe176b7b95e89ddc48fcea5fe2e31bb1e25a..eecf90fa90024f2c018b0e597331069ffbadbe55 100644 (file)
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -158,7 +158,7 @@ jQuery.fn.extend({
                        }
 
                        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" ) ) {
                                var values = jQuery.makeArray(val);

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 7521c767f9c0af4fd75f49a69856a11db3bd9f37..0ebae1638471f3defe49bddb1fa0ba6084d512dd 100644 (file)
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -619,7 +619,7 @@ test("clone() on XML nodes", function() {
 }
 
 test("val()", function() {
-       expect(11);
+       expect(15);
 
        document.getElementById('text1').value = "bla";
        equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
@@ -646,6 +646,22 @@ test("val()", function() {
        jQuery('#select3').val("");
        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) {