Permalink
Browse files

Serialize: Treat literal and function-returned null/undefined the same

Fixes gh-3005

Closes gh-3007
  • Loading branch information...
1 parent 5d20a3c commit 9fdbdd393a0f0ebdcd837cf102878c8b45860c3b @jtrumbull jtrumbull committed with gibson042 Mar 17, 2016
Showing with 8 additions and 2 deletions.
  1. +4 −1 src/serialize.js
  2. +4 −1 test/unit/serialize.js
View
@@ -58,7 +58,10 @@ jQuery.param = function( a, traditional ) {
add = function( key, value ) {
// If value is a function, invoke it and return its value
- value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
+ value = jQuery.isFunction( value ) ? value() : value;
+ if ( value == null ) {
+ value = "";
+ }
s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
};
@@ -1,7 +1,7 @@
QUnit.module( "serialize", { teardown: moduleTeardown } );
QUnit.test( "jQuery.param()", function( assert ) {
- assert.expect( 23 );
+ assert.expect( 24 );
var params, settings;
@@ -74,6 +74,9 @@ QUnit.test( "jQuery.param()", function( assert ) {
params = { "param1": null };
assert.equal( jQuery.param( params, false ), "param1=", "Make sure that null params aren't traversed." );
+ params = { "param1": function() {}, "param2": function() { return null; } };
+ assert.equal( jQuery.param( params, false ), "param1=&param2=", "object with function property that returns null value" );
+
params = { "test": { "length": 3, "foo": "bar" } };
assert.equal( jQuery.param( params, false ), "test%5Blength%5D=3&test%5Bfoo%5D=bar", "Sub-object with a length property" );

0 comments on commit 9fdbdd3

Please sign in to comment.