X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax.js;h=bf0cf109f6385d1f0a57ebf2154e466093459d01;hb=c6a44c7943f460594a6a75081ad9bce76fea80f0;hp=ffe30481d37e956024115124454c52801b82f9eb;hpb=b4e23b5af0820a66c2e275051f613f3df9a4444d;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index ffe3048..bf0cf10 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -52,10 +52,7 @@ jQuery.fn.extend({
 						// If not, just inject the full result
 						res.responseText );
 
-				// Add delay to account for Safari's delay in globalEval
-				setTimeout(function(){
-					self.each( callback, [res.responseText, status, res] );
-				}, 13);
+				self.each( callback, [res.responseText, status, res] );
 			}
 		});
 		return this;
@@ -64,7 +61,7 @@ jQuery.fn.extend({
 	serialize: function() {
 		return jQuery.param(this.serializeArray());
 	},
-
	serializeArray: function() {
+	serializeArray: function() {
 		return this.map(function(){
 			return jQuery.nodeName(this, "form") ?
 				jQuery.makeArray(this.elements) : this;
@@ -74,13 +71,16 @@ jQuery.fn.extend({
 				(this.checked || /select|textarea/i.test(this.nodeName) || 
 					/text|hidden|password/i.test(this.type));
 		})
-		.map(function(i, elem){
			var val = jQuery(this).val();
+		.map(function(i, elem){
+			var val = jQuery(this).val();
 			return val == null ? null :
 				val.constructor == Array ?
-					jQuery.map( val, function(i, val){
						return {name: elem.name, value: val};
+					jQuery.map( val, function(val, i){
+						return {name: elem.name, value: val};
 					}) :
-					{name: elem.name, value: val};
-		}).get();
	}
+					{name: elem.name, value: val};
+		}).get();
+	}
 });
 
 // Attach a bunch of functions for handling common AJAX events
@@ -160,24 +160,24 @@ jQuery.extend({
 		if ( s.data && s.processData && typeof s.data != "string" )
 			s.data = jQuery.param(s.data);
 
-		// Break the data into one single string
-		var q = s.url.indexOf("?");
-		if ( q > -1 ) {
-			s.data = (s.data ? s.data + "&" : "") + s.url.slice(q + 1);
-			s.url = s.url.slice(0, q);
-		}
-
 		// Handle JSONP Parameter Callbacks
 		if ( s.dataType == "jsonp" ) {
-			if ( !s.data || !s.data.match(jsre) )
+			if ( s.type.toLowerCase() == "get" ) {
+				if ( !s.url.match(jsre) )
+					s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?";
+			} else if ( !s.data || !s.data.match(jsre) )
 				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
 			s.dataType = "json";
 		}
 
 		// Build temporary JSONP function
-		if ( s.dataType == "json" && s.data && s.data.match(jsre) ) {
+		if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) {
 			jsonp = "jsonp" + jsc++;
-			s.data = s.data.replace(jsre, "=" + jsonp);
+
+			// Replace the =? sequence both in the query string and the data
+			if ( s.data )
+				s.data = (s.data + "").replace(jsre, "=" + jsonp);
+			s.url = s.url.replace(jsre, "=" + jsonp);
 
 			// We need to make sure
 			// that a JSONP style response is executed properly
@@ -187,6 +187,7 @@ jQuery.extend({
 			window[ jsonp ] = function(tmp){
 				data = tmp;
 				success();
+				complete();
 				// Garbage collect
 				window[ jsonp ] = undefined;
 				try{ delete window[ jsonp ]; } catch(e){}
@@ -196,12 +197,17 @@ jQuery.extend({
 		if ( s.dataType == "script" && s.cache == null )
 			s.cache = false;
 
-		if ( s.cache === false && s.type.toLowerCase() == "get" )
-			s.data = (s.data ? s.data + "&" : "") + "_=" + (new Date()).getTime();
+		if ( s.cache === false && s.type.toLowerCase() == "get" ) {
+			var ts = (new Date()).getTime();
+			// try replacing _= if it is there
+			var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
+			// if nothing was replaced, add timestamp to the end
+			s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
+		}
 
 		// If data is available, append data to url for get requests
 		if ( s.data && s.type.toLowerCase() == "get" ) {
-			s.url += "?" + s.data;
+			s.url += (s.url.match(/\?/) ? "&" : "?") + s.data;
 
 			// IE likes to send both get and post data, prevent this
 			s.data = null;
@@ -212,13 +218,14 @@ jQuery.extend({
 			jQuery.event.trigger( "ajaxStart" );
 
 		// If we're requesting a remote document
-		// and trying to load JSON or Script
-		if ( !s.url.indexOf("http") && s.dataType == "script" ) {
+		// and trying to load JSON or Script with a GET
+		if ( !s.url.indexOf("http") && ( s.dataType == "script" || s.dataType =="json" ) && s.type.toLowerCase() == "get" ) {
+			var head = document.getElementsByTagName("head")[0];
 			var script = document.createElement("script");
 			script.src = s.url;
 
 			// Handle Script loading
-			if ( !jsonp && (s.success || s.complete) ) {
+			if ( !jsonp ) {
 				var done = false;
 
 				// Attach handlers for all browsers
@@ -228,12 +235,12 @@ jQuery.extend({
 						done = true;
 						success();
 						complete();
-						document.body.removeChild( script );
+						head.removeChild( script );
 					}
 				};
 			}
 
-			document.body.appendChild(script);
+			head.appendChild(script);
 
 			// We handle everything using the script element injection
 			return;
@@ -265,7 +272,7 @@ jQuery.extend({
 			s.beforeSend(xml);
 			
 		if ( s.global )
-		    jQuery.event.trigger("ajaxSend", [xml, s]);
+			jQuery.event.trigger("ajaxSend", [xml, s]);
 
 		// Wait for a response to come back
 		var onreadystatechange = function(isTimeout){
@@ -392,8 +399,9 @@ jQuery.extend({
 	// Determines if an XMLHttpRequest was successful or not
 	httpSuccess: function( r ) {
 		try {
+			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
 			return !r.status && location.protocol == "file:" ||
-				( r.status >= 200 && r.status < 300 ) || r.status == 304 ||
+				( r.status >= 200 && r.status < 300 ) || r.status == 304 || r.status == 1223 ||
 				jQuery.browser.safari && r.status == undefined;
 		} catch(e){}
 		return false;