diff options
| -rw-r--r-- | src/ajax.js | 2 | ||||
| -rw-r--r-- | test/unit/ajax.js | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ajax.js b/src/ajax.js index 3ef2d4f1e..3c199af95 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -665,7 +665,7 @@ jQuery.extend({ } }); - } else if ( !traditional && typeof obj === "object" ) { + } else if ( !traditional && obj != null && typeof obj === "object" ) { // Serialize object item. jQuery.each( obj, function( k, v ) { buildParams( prefix + "[" + k + "]", v ); diff --git a/test/unit/ajax.js b/test/unit/ajax.js index 298fb5bab..582aa37b6 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -282,7 +282,7 @@ test("serialize()", function() { }); test("jQuery.param()", function() { - expect(17); + expect(18); equals( !jQuery.ajaxSettings.traditional, true, "traditional flag, falsy by default" ); @@ -336,7 +336,8 @@ test("jQuery.param()", function() { params = { a:[1,2], b:{ c:3, d:[4,5], e:{ x:[6], y:7, z:[8,9] }, f:true, g:false, h:undefined }, i:[10,11], j:true, k:false, l:[undefined,0], m:"cowboy hat?" }; equals( decodeURIComponent( jQuery.param(params,false) ), "a[]=1&a[]=2&b[c]=3&b[d][]=4&b[d][]=5&b[e][x][]=6&b[e][y]=7&b[e][z][]=8&b[e][z][]=9&b[f]=true&b[g]=false&b[h]=undefined&i[]=10&i[]=11&j=true&k=false&l[]=undefined&l[]=0&m=cowboy+hat?", "huge structure, forced not traditional" ); - + params = { param1: null }; + equals( jQuery.param(params,false), "param1=null", "Make sure that null params aren't traversed." ); }); test("synchronous request", function() { |