X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax.js;h=b39bc8ddbada1a8e77600fe919cb21143ce7c554;hb=a4fc842019a678a331c7322a5be747e6adc426ca;hp=d6c35d42364de03a3493d08961805db6a793c9fc;hpb=a58f8f22d19ff88fedb324bdf97d22dd7c16131f;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index d6c35d4..b39bc8d 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -4,7 +4,7 @@ var jsc = jQuery.now(),
 	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
 	rselectTextarea = /^(?:select|textarea)/i,
 	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
-	rnoContent = /^(?:GET|HEAD|DELETE)$/,
+	rnoContent = /^(?:GET|HEAD)$/,
 	rbracket = /\[\]$/,
 	jsre = /\=\?(&|$)/,
 	rquery = /\?/,
@@ -208,6 +208,12 @@ jQuery.extend({
 			s.data = jQuery.param( s.data, s.traditional );
 		}
 
+		// If the jsonpCallback has been set, we can assume that dataType is jsonp
+		// Ticket #5803
+		if ( s.jsonpCallback ) {
+		  s.dataType = "jsonp";
+		}
+
 		// Handle JSONP Parameter Callbacks
 		if ( s.dataType === "jsonp" ) {
 			if ( type === "GET" ) {
@@ -265,7 +271,7 @@ jQuery.extend({
 			s.cache = false;
 		}
 
-		if ( s.cache === false && type === "GET" ) {
+		if ( s.cache === false && noContent ) {
 			var ts = jQuery.now();
 
 			// try replacing _= if it is there
@@ -275,8 +281,8 @@ jQuery.extend({
 			s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
 		}
 
-		// If data is available, append data to url for get requests
-		if ( s.data && type === "GET" ) {
+		// If data is available, append data to url for GET/HEAD requests
+		if ( s.data && noContent ) {
 			s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
 		}