diff options
Diffstat (limited to 'src/ajax/jsonp.js')
| -rw-r--r-- | src/ajax/jsonp.js | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js index e1f2b5314..9965b2230 100644 --- a/src/ajax/jsonp.js +++ b/src/ajax/jsonp.js @@ -1,13 +1,16 @@ (function( jQuery ) { var jsc = jQuery.now(), - jsre = /(\=)\?(&|$)|\?\?/i; + jsre = /(\=)\?(&|$)|\?\?/i, + jscallbacks = []; // Default jsonp settings jQuery.ajaxSetup({ jsonp: "callback", jsonpCallback: function() { - return jQuery.expando + "_" + ( jsc++ ); + var callback = jscallbacks.pop() || ( jQuery.expando + "_" + ( jsc++ ) ); + this[ callback ] = true; + return callback; } }); @@ -53,6 +56,13 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) { jqXHR.always(function() { // Set callback back to previous value window[ jsonpCallback ] = previous; + // Save back as free + if ( s[ jsonpCallback ] ) { + // make sure that re-using the options doesn't screw things around + s.jsonpCallback = originalSettings.jsonpCallback; + // save the callback name for future use + jscallbacks.push( jsonpCallback ); + } // Call if it was a function and we have a response if ( responseContainer && jQuery.isFunction( previous ) ) { window[ jsonpCallback ]( responseContainer[ 0 ] ); |