deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:jquery/jquery

Browse source
This commit is contained in:
jeresig 2009-12-22 13:53:04 -05:00
commit baff0b0c85
2 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/ajax.js
View file

@ -40,7 +40,7 @@ jQuery.fn.extend({
// Otherwise, build a param string
} else if ( typeof params === "object" ) {
params = jQuery.param( params );
params = jQuery.param( params, jQuery.ajaxSettings.traditional );
type = "POST";
}
}
@ -172,6 +172,7 @@ jQuery.extend({
data: null,
username: null,
password: null,
traditional: false,
*/
// Create the request object; Microsoft failed to properly
// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
@ -204,7 +205,7 @@ jQuery.extend({
// convert data if not already a string
if ( s.data && s.processData && typeof s.data !== "string" ) {
s.data = jQuery.param(s.data);
s.data = jQuery.param( s.data, s.traditional );
}
// Handle JSONP Parameter Callbacks
@ -594,12 +595,14 @@ jQuery.extend({
// Serialize an array of form elements or a set of
// key/values into a query string
param: function( a ) {
param: function( a, traditional ) {
var s = [],
// Set jQuery.param.traditional to true for jQuery <= 1.3.2 behavior.
traditional = jQuery.param.traditional;
var s = [];
// Set traditional to true for jQuery <= 1.3.2 behavior.
if ( traditional === undefined ) {
traditional = jQuery.ajaxSettings.traditional;
}
function add( key, value ) {
// If value is a function, invoke it and return its value
@ -615,8 +618,8 @@ jQuery.extend({
});
} else {
// If jQuery.param.traditional is true, encode the "old" way (the
// way 1.3.2 or older did it), otherwise encode params recursively.
// If traditional, encode the "old" way (the way 1.3.2 or older
// did it), otherwise encode params recursively.
jQuery.each( a, function buildParams( prefix, obj ) {
if ( jQuery.isArray(obj) ) {