From 386c0bc8a686eaa90be12dd1c6690668ff7442c7 Mon Sep 17 00:00:00 2001 From: Mike Alsup Date: Sun, 7 Jan 2007 20:56:17 +0000 Subject: [PATCH] Updated param method to encode name as well as value (per spec: http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4.1) --- src/ajax/ajax.js | 6 +++--- src/ajax/ajaxTest.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js index 9a9e0eb6..f87f5629 100644 --- a/src/ajax/ajax.js +++ b/src/ajax/ajax.js @@ -790,7 +790,7 @@ jQuery.extend({ if ( a.constructor == Array || a.jquery ) // Serialize the form elements for ( var i = 0; i < a.length; i++ ) - s.push( a[i].name + "=" + encodeURIComponent( a[i].value ) ); + s.push( encodeURIComponent(a[i].name) + "=" + encodeURIComponent( a[i].value ) ); // Otherwise, assume that it's an object of key/value pairs else @@ -799,9 +799,9 @@ jQuery.extend({ // If the value is an array then the key names need to be repeated if ( a[j].constructor == Array ) for ( var k = 0; k < a[j].length; k++ ) - s.push( j + "=" + encodeURIComponent( a[j][k] ) ); + s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j][k] ) ); else - s.push( j + "=" + encodeURIComponent( a[j] ) ); + s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j] ) ); // Return the resulting serialization return s.join("&"); diff --git a/src/ajax/ajaxTest.js b/src/ajax/ajaxTest.js index c8fae234..b215d95a 100644 --- a/src/ajax/ajaxTest.js +++ b/src/ajax/ajaxTest.js @@ -4,7 +4,7 @@ test("serialize()", function() { expect(1); var data = $(':input').not('button').serialize(); // ignore button, IE takes text content as value, not relevant for this test - ok( data == 'action=Test&text2=Test&radio1=on&radio2=on&check=on&=on&hidden=&foo[bar]=&name=name&=foobar&select1=&select2=3&select3=1', 'Check form serialization as query string' ); + ok( data == 'action=Test&text2=Test&radio1=on&radio2=on&check=on&=on&hidden=&foo%5Bbar%5D=&name=name&=foobar&select1=&select2=3&select3=1', 'Check form serialization as query string' ); }); test("param", function() { @@ -16,10 +16,10 @@ test("param", function() { ok( $.param(params) == "someName=1&someName=2&someName=3®ularThing=blah", "with array" ); params = {"foo[]":["baz", 42, "All your base are belong to us"]}; - ok( $.param(params) == "foo[]=baz&foo[]=42&foo[]=All%20your%20base%20are%20belong%20to%20us", "more array" ); + ok( $.param(params) == "foo%5B%5D=baz&foo%5B%5D=42&foo%5B%5D=All%20your%20base%20are%20belong%20to%20us", "more array" ); params = {"foo[bar]":"baz", "foo[beep]":42, "foo[quux]":"All your base are belong to us"}; - ok( $.param(params) == "foo[bar]=baz&foo[beep]=42&foo[quux]=All%20your%20base%20are%20belong%20to%20us", "even more arrays" ); + ok( $.param(params) == "foo%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All%20your%20base%20are%20belong%20to%20us", "even more arrays" ); }); test("pass-through request object", function() {