X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=3416dd66d145e7c0ed56eaa7304adc710e1cafed;hb=0f6e9a8c69007ce7ebbb7c46637115a207d1a594;hp=f8ac52ece9bd26d9c8a1df26f8de83333641cfc6;hpb=183f37e4b4128af7ba096ac40046768b84b6d66e;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index f8ac52e..3416dd6 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -15,6 +15,10 @@ jQuery.fn.extend({
 	load: function( url, params, callback ) {
 		if ( typeof url !== "string" ) {
 			return this._load( url );
+
+		// Don't do a request if no elements are being requested
+		} else if ( !this.length ) {
+			return this;
 		}
 
 		var off = url.indexOf(" ");
@@ -102,7 +106,7 @@ jQuery.fn.extend({
 });
 
 // Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function(i,o){
 	jQuery.fn[o] = function(f){
 		return this.bind(o, f);
 	};
@@ -111,8 +115,9 @@ jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".sp
 jQuery.extend({
 
 	get: function( url, data, callback, type ) {
-		// shift arguments if data argument was ommited
+		// shift arguments if data argument was omited
 		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
 			callback = data;
 			data = null;
 		}
@@ -135,7 +140,9 @@ jQuery.extend({
 	},
 
 	post: function( url, data, callback, type ) {
+		// shift arguments if data argument was omited
 		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
 			callback = data;
 			data = {};
 		}
@@ -191,7 +198,7 @@ jQuery.extend({
 	ajax: function( s ) {
 		// Extend the settings, but re-extend 's' so that it can be
 		// checked again later (in the test suite, specifically)
-		s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
+		s = jQuery.extend(true, {}, jQuery.ajaxSettings, s);
 		
 		var jsonp, status, data,
 			callbackContext = s.context || window,
@@ -331,16 +338,16 @@ jQuery.extend({
 				xhr.setRequestHeader("Content-Type", s.contentType);
 			}
 
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					if ( jQuery.lastModified[s.url] ) {
-						xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
-					}
+			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+			if ( s.ifModified ) {
+				if ( jQuery.lastModified[s.url] ) {
+					xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
+				}
 
-					if ( jQuery.etag[s.url] ) {
-						xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
-					}
+				if ( jQuery.etag[s.url] ) {
+					xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
 				}
+			}
 
 			// Set header so the called script knows that it's an XMLHttpRequest
 			xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
@@ -454,6 +461,8 @@ jQuery.extend({
 			xhr.send( type === "POST" || type === "PUT" ? s.data : null );
 		} catch(e) {
 			jQuery.handleError(s, xhr, null, e);
+			// Fire the complete handlers
+			complete();
 		}
 
 		// firefox 1.5 doesn't fire statechange for sync requests
@@ -464,7 +473,7 @@ jQuery.extend({
 		function success(){
 			// If a local callback was specified, fire it and pass it the data
 			if ( s.success ) {
-				s.success.call( callbackContext, data, status );
+				s.success.call( callbackContext, data, status, xhr );
 			}
 
 			// Fire the global callback
@@ -582,39 +591,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, "+");