X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fjsonp.js;h=0588475b62a339aa44e72500cf72b167cca5adf5;hb=dd5bf421225d23bc8732a92ea82049859c0cd57a;hp=883876fc0b1733ee58916def06c0d3df7385fa4e;hpb=158fa822dea3198de5a4bcff3955b869ebb758c8;p=jquery.git diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js index 883876f..0588475 100644 --- a/src/ajax/jsonp.js +++ b/src/ajax/jsonp.js @@ -9,12 +9,13 @@ jQuery.ajaxSetup({ jsonpCallback: function() { return "jsonp" + jsc++; } +}); // Detect, normalize options and install callbacks for jsonp requests // (dataIsString is used internally) -}).ajaxPrefilter("json jsonp", function(s, originalSettings, dataIsString) { +jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, dataIsString ) { - dataIsString = ( typeof(s.data) === "string" ); + dataIsString = ( typeof( s.data ) === "string" ); if ( s.dataTypes[ 0 ] === "jsonp" || originalSettings.jsonpCallback || @@ -46,23 +47,25 @@ jQuery.ajaxSetup({ 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 ]; @@ -81,6 +84,6 @@ jQuery.ajaxSetup({ // Delegate to script return "script"; } -}); +} ); })( jQuery );