Fixes #8054 by reverting feature enhancement 5812 (4920). Regexps no longer searches...

[jquery.git] / src / ajax / jsonp.js

diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index 0af0056..16a4c2f 100644 (file)
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -1,8 +1,7 @@
 (function( jQuery ) {
 
 var jsc = jQuery.now(),
-       jsre = /\=\?(&|$)/,
-       rquery_jsonp = /\?/;
+       jsre = /(\=)\?(&|$)|()\?\?()/i;
 
 // Default jsonp settings
 jQuery.ajaxSetup({
@@ -12,73 +11,78 @@ jQuery.ajaxSetup({
        }
 });
 
-// Normalize jsonp queries
-// 1) put callback parameter in url or data
-// 2) sneakily ensure transportDataType is always jsonp for jsonp requests
-jQuery.ajax.prefilter("json jsonp", function(s, originalSettings) {
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, dataIsString /* internal */ ) {
+
+       dataIsString = ( typeof s.data === "string" );
 
        if ( s.dataTypes[ 0 ] === "jsonp" ||
-               originalSettings.jsonp ||
                originalSettings.jsonpCallback ||
-               jsre.test(s.url) ||
-               typeof(s.data) === "string" && jsre.test(s.data) ) {
+               originalSettings.jsonp != null ||
+               s.jsonp !== false && ( jsre.test( s.url ) ||
+                               dataIsString && jsre.test( s.data ) ) ) {
 
-               var jsonpCallback = s.jsonpCallback =
+               var responseContainer,
+                       jsonpCallback = s.jsonpCallback =
                                jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
-                       url = s.url.replace(jsre, "=" + jsonpCallback + "$1"),
-                       data = s.url === url && typeof(s.data) === "string" ? s.data.replace(jsre, "=" + jsonpCallback + "$1") : s.data;
-
-               if ( url === s.url && data === s.data ) {
-                       url += (rquery_jsonp.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
+                       previous = window[ jsonpCallback ],
+                       url = s.url,
+                       data = s.data,
+                       replace = "$1" + jsonpCallback + "$2";
+
+               if ( s.jsonp !== false ) {
+                       url = url.replace( jsre, replace );
+                       if ( s.url === url ) {
+                               if ( dataIsString ) {
+                                       data = data.replace( jsre, replace );
+                               }
+                               if ( s.data === data ) {
+                                       // Add callback manually
+                                       url += (/\?/.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
+                               }
+                       }
                }
 
                s.url = url;
                s.data = data;
-               s.dataTypes[ 0 ] = "jsonp";
-       }
-
-// Bind transport to jsonp dataType
-}).transport("jsonp", function(s) {
-
-       // Put callback in place
-       var responseContainer,
-               jsonpCallback = s.jsonpCallback,
-               previous = window[ jsonpCallback ];
-
-       window [ jsonpCallback ] = function( response ) {
-               responseContainer = [response];
-       };
 
-       s.complete = [function() {
+               window[ jsonpCallback ] = function( response ) {
+                       responseContainer = [ response ];
+               };
+
+               s.complete = [ function() {
+
+                       // Set callback back to previous value
+                       window[ jsonpCallback ] = previous;
+
+                       // Call if it was a function and we have a response
+                       if ( previous) {
+                               if ( responseContainer && jQuery.isFunction( previous ) ) {
+                                       window[ jsonpCallback ] ( responseContainer[ 0 ] );
+                               }
+                       } else {
+                               // else, more memory leak avoidance
+                               try{
+                                       delete window[ jsonpCallback ];
+                               } catch( e ) {}
+                       }
 
-               // Set callback back to previous value
-               window[ jsonpCallback ] = previous;
+               }, s.complete ];
 
-               // Call if it was a function and we have a response
-               if ( previous) {
-                       if ( responseContainer && jQuery.isFunction ( previous ) ) {
-                               window[ jsonpCallback ] ( responseContainer[0] );
+               // Use data converter to retrieve json after script execution
+               s.converters["script json"] = function() {
+                       if ( ! responseContainer ) {
+                               jQuery.error( jsonpCallback + " was not called" );
                        }
-               } else {
-                       // else, more memory leak avoidance
-                       try{ delete window[ jsonpCallback ]; } catch(e){}
-               }
+                       return responseContainer[ 0 ];
+               };
 
-       }, s.complete ];
+               // force json dataType
+               s.dataTypes[ 0 ] = "json";
 
-       // Sneakily ensure this will be handled as json
-       s.dataTypes[ 0 ] = "json";
-
-       // Use data converter to retrieve json after script execution
-       s.converters["script json"] = function() {
-               if ( ! responseContainer ) {
-                       jQuery.error( jsonpCallback + " was not called" );
-               }
-               return responseContainer[ 0 ];
-       };
-
-       // Delegate to script transport
-       return "script";
-});
+               // Delegate to script
+               return "script";
+       }
+} );
 
 })( jQuery );