Moved jQuery.param "traditional" flag into jQuery.ajaxSettings, can now be overridden...

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 0d1dd84..098a561 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -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,17 +595,19 @@ 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
                        value = jQuery.isFunction(value) ? value() : value;
-                       s[ s.length ] = encodeURIComponent(key) + '=' + encodeURIComponent(value);
+                       s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
                }
                
                // If an array was passed in, assume that it is an array of form elements.
@@ -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) ) {