X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax%2Fjsonp.js;h=c70aeb7df3e95bab144ccd3cce6efdfe02e2d153;hb=735a949a0649f0299e8e4d87b259290970a68ddf;hp=ebc660fbac8bc35d79b3adc604ae836c4eba7c8b;hpb=f286a716d5e5836b8508eb5771624de0aafdb235;p=jquery.git diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js index ebc660f..c70aeb7 100644 --- a/src/ajax/jsonp.js +++ b/src/ajax/jsonp.js @@ -1,7 +1,7 @@ (function( jQuery ) { var jsc = jQuery.now(), - jsre = /(\=)\?(&|$)|()\?\?()/i; + jsre = /(\=)\?(&|$)|\?\?/i; // Default jsonp settings jQuery.ajaxSetup({ @@ -12,7 +12,7 @@ jQuery.ajaxSetup({ }); // Detect, normalize options and install callbacks for jsonp requests -jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jXHR ) { +jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) { var dataIsString = ( typeof s.data === "string" ); @@ -60,7 +60,7 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jXHR ) { }; // Install cleanUp function - jXHR.then( cleanUp, cleanUp ); + jqXHR.then( cleanUp, cleanUp ); // Use data converter to retrieve json after script execution s.converters["script json"] = function() {