Make .val(undefined) == .val("") and chainable; fixes #4130.

Ensure .val(null) sets an empty string on IE6/7; fixes #5163.

diff --git a/src/attributes.js b/src/attributes.js
index a76695b661d16c9aa4077182a3ead23544a17696..fd3e38acec80d174f82cbe44313a646d6ad8065b 100644 (file)
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -136,7 +136,7 @@ jQuery.fn.extend({
        },
 
        val: function( value ) {
-               if ( value === undefined ) {
+               if ( !arguments.length ) {
                        var elem = this[0];
 
                        if ( elem ) {
@@ -209,9 +209,10 @@ jQuery.fn.extend({
                                val = value.call(this, i, self.val());
                        }
 
-                       // Typecast each time if the value is a Function and the appended
-                       // value is therefore different each time.
-                       if ( typeof val === "number" ) {
+                       // Treat null/undefined as ""; convert numbers to string
+                       if ( val == null ) {
+                               val = "";
+                       } else if ( typeof val === "number" ) {
                                val += "";
                        }
 

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 986623b427c276e6c1a35d4b60de25d1f0917797..3326dfe890c8c6e4cfab1bae5b7dbd6269cd5d5d 100644 (file)
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -359,14 +359,20 @@ test("val()", function() {
 });
 
 var testVal = function(valueObj) {
-       expect(6);
+       expect(8);
 
        jQuery("#text1").val(valueObj( 'test' ));
        equals( document.getElementById('text1').value, "test", "Check for modified (via val(String)) value of input element" );
 
+       jQuery("#text1").val(valueObj( undefined ));
+       equals( document.getElementById('text1').value, "", "Check for modified (via val(undefined)) value of input element" );
+
        jQuery("#text1").val(valueObj( 67 ));
        equals( document.getElementById('text1').value, "67", "Check for modified (via val(Number)) value of input element" );
 
+       jQuery("#text1").val(valueObj( null ));
+       equals( document.getElementById('text1').value, "", "Check for modified (via val(null)) value of input element" );
+
        jQuery("#select1").val(valueObj( "3" ));
        equals( jQuery("#select1").val(), "3", "Check for modified (via val(String)) value of select element" );