X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=09aba1410777a959b356e1e1a742acae4e3820a8;hb=5736e8d90d5c7961e19cb707301d9f58daa0aa3b;hp=f401c85380eb2c248de9793032a289ce87f29b5f;hpb=62d84e44ac3b4a3673c320514bbf5ac8dc7712d6;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index f401c85..09aba141 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -174,12 +174,12 @@ jQuery.extend({
 		}
 
 		// Build temporary JSONP function
-		if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) {
+		if ( s.dataType == "json" && (s.data && jsre.test( s.data ) || s.url.match(jsre)) ) {
 			jsonp = "jsonp" + jsc++;
 
 			// Replace the =? sequence both in the query string and the data
 			if ( s.data )
-				s.data = s.data.replace(jsre, "=" + jsonp);
+				s.data = (s.data + "").replace(jsre, "=" + jsonp);
 			s.url = s.url.replace(jsre, "=" + jsonp);
 
 			// We need to make sure
@@ -223,7 +223,7 @@ jQuery.extend({
 			script.src = s.url;
 
 			// Handle Script loading
-			if ( !jsonp && (s.success || s.complete) ) {
+			if ( !jsonp ) {
 				var done = false;
 
 				// Attach handlers for all browsers