X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax%2Fjsonp.js;h=f5742d998bd6bb6069c28a815214abaa255b27bc;hb=ee22c8b34bb801f26cacc67a1a3a0ac595fe7928;hp=ff8d1f145471b2fdea24054edd365c2bcb232c28;hpb=64e1cdbb95b8bbefbc9dec70ae30e0714a549619;p=jquery.git diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js index ff8d1f1..f5742d9 100644 --- a/src/ajax/jsonp.js +++ b/src/ajax/jsonp.js @@ -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 );