X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=915bbaa3e73d987799437bf2ee293031f515ea54;hb=3b50eaca2cd0b1439235e39c4e98a6438e8f55b2;hp=f3252ebc4bd624cd7cc91a49ea8035c5e1a78d66;hpb=39addc87a37b32be19f2c58ec8babe752c0243e1;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index f3252eb..915bbaa 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -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" ) {
@@ -250,14 +256,14 @@ jQuery.extend({
 						delete window[ jsonp ];
 					} catch( jsonpError ) {}
 				}
+
+				data = tmp;
+				jQuery.handleSuccess( s, xhr, status, data );
+				jQuery.handleComplete( s, xhr, status, data );
 				
 				if ( head ) {
 					head.removeChild( script );
 				}
-				
-				data = tmp;
-				jQuery.ajax.handleSuccess( s, xhr, status, data );
-				jQuery.ajax.handleComplete( s, xhr, status, data );
 			};
 		}