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 ff8d1f1..16a4c2f 100644 (file)
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -1,7 +1,7 @@
 (function( jQuery ) {
 
 var jsc = jQuery.now(),
-       jsre = /(\=)(?:\?|%3F)(&|$)|()(?:\?\?|%3F%3F)()/i;
+       jsre = /(\=)\?(&|$)|()\?\?()/i;
 
 // Default jsonp settings
 jQuery.ajaxSetup({
@@ -12,10 +12,9 @@ jQuery.ajaxSetup({
 });
 
 // Detect, normalize options and install callbacks for jsonp requests
-// (dataIsString is used internally)
-jQuery.ajaxPrefilter("json jsonp", function(s, originalSettings, dataIsString) {
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, dataIsString /* internal */ ) {
 
-       dataIsString = ( typeof(s.data) === "string" );
+       dataIsString = ( typeof s.data === "string" );
 
        if ( s.dataTypes[ 0 ] === "jsonp" ||
                originalSettings.jsonpCallback ||
@@ -47,23 +46,25 @@ jQuery.ajaxPrefilter("json jsonp", function(s, originalSettings, dataIsString) {
                s.url = url;
                s.data = data;
 
-               window [ jsonpCallback ] = function( response ) {
-                       responseContainer = [response];
+               window[ jsonpCallback ] = function( response ) {
+                       responseContainer = [ response ];
                };
 
-               s.complete = [function() {
+               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] );
+                               if ( responseContainer && jQuery.isFunction( previous ) ) {
+                                       window[ jsonpCallback ] ( responseContainer[ 0 ] );
                                }
                        } else {
                                // else, more memory leak avoidance
-                               try{ delete window[ jsonpCallback ]; } catch(e){}
+                               try{
+                                       delete window[ jsonpCallback ];
+                               } catch( e ) {}
                        }
 
                }, s.complete ];
@@ -82,6 +83,6 @@ jQuery.ajaxPrefilter("json jsonp", function(s, originalSettings, dataIsString) {
                // Delegate to script
                return "script";
        }
-});
+} );
 
 })( jQuery );