X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=858ac4b7a2b5923ad0df4c4e3aff02c5b762b709;hb=67089eedf6f84acd9c16ea2a6dadadf7b13a7c84;hp=47e66352f5886b0c6e41fa0e5302b8b65759ee89;hpb=45dfa3b0fc49718c4f00600d1e25a129601d08ee;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 47e6635..858ac4b 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -585,39 +585,52 @@ jQuery.extend({
 	// Serialize an array of form elements or a set of
 	// key/values into a query string
 	param: function( a ) {
-		var s = [];
-
+		var s = [],
+			param_traditional = jQuery.param.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);
 		}
-
+		
 		// If an array was passed in, assume that it is an array
 		// of form elements
-		if ( jQuery.isArray(a) || a.jquery ) {
+		if ( jQuery.isArray(a) || a.jquery )
 			// Serialize the form elements
 			jQuery.each( a, function() {
 				add( this.name, this.value );
 			});
-		} else {
-			// Recursively encode parameters from object, 
-			// building a prefix path as we go down
-			function buildParams(obj, prefix)
-			{
-				if ( jQuery.isArray(obj) ) {
-					for ( var i = 0, length = obj.length; i < length; i++ ) {
-						buildParams( obj[i], prefix );
-					};
-				} else if( typeof(obj) == "object" ) {
-					for ( var j in obj ) {
-						var postfix = ((j.indexOf("[]") > 0) ? "[]" : ""); // move any brackets to the end
-						buildParams(obj[j], (prefix ? (prefix+"["+j.replace("[]", "")+"]"+postfix) : j) );
-					}
-				} else {
-					add( prefix, jQuery.isFunction(obj) ? obj() : obj );
-				}
-			}
-			buildParams(a);
-		}
+			
+		else
+			// Encode parameters from object, recursively. If
+			// jQuery.param.traditional is set, encode the "old" way
+			// (the way 1.3.2 or older did it)
+			jQuery.each( a, function buildParams( prefix, obj ) {
+				
+				if ( jQuery.isArray(obj) )
+					jQuery.each( obj, function(i,v){
+						// Due to rails' limited request param syntax, numeric array
+						// indices are not supported. To avoid serialization ambiguity
+						// issues, serialized arrays can only contain scalar values. php
+						// does not have this issue, but we should go with the lowest
+						// common denominator
+						add( prefix + ( param_traditional ? "" : "[]" ), v );
+					});
+					
+				else if ( typeof obj == "object" )
+					if ( param_traditional )
+						add( prefix, obj );
+						
+					else
+						jQuery.each( obj, function(k,v){
+							buildParams( prefix ? prefix + "[" + k + "]" : k, v );
+						});
+					
+				else
+					add( prefix, obj );
+				
+			});
 
 		// Return the resulting serialization
 		return s.join("&").replace(r20, "+");