diff options
| author | Timmy Willison <timmywillisn@gmail.com> | 2013-08-15 14:15:49 -0400 |
|---|---|---|
| committer | Timmy Willison <timmywillisn@gmail.com> | 2013-08-15 14:15:49 -0400 |
| commit | 6318ae6ab90d4b450dfadf32ab95fe52ed6331cb (patch) | |
| tree | 50b247fed8569e909e380b281e9145bd1458a39e /src/ajax/jsonp.js | |
| parent | 7627b8b6d9ef6e57dbd20a55b946bd1991c1223e (diff) | |
| download | jquery-6318ae6ab90d4b450dfadf32ab95fe52ed6331cb.tar.gz jquery-6318ae6ab90d4b450dfadf32ab95fe52ed6331cb.zip | |
AMD-ify jQuery sourcegit s! Woo! Fixes #14113, #14163.
Diffstat (limited to 'src/ajax/jsonp.js')
| -rw-r--r-- | src/ajax/jsonp.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js index b8803df44..ff0d53899 100644 --- a/src/ajax/jsonp.js +++ b/src/ajax/jsonp.js @@ -1,3 +1,10 @@ +define([ + "../core", + "./var/nonce", + "./var/rquery", + "../ajax" +], function( jQuery, nonce, rquery ) { + var oldCallbacks = [], rjsonp = /(=)\?(?=&|$)|\?\?/; @@ -5,7 +12,7 @@ var oldCallbacks = [], jQuery.ajaxSetup({ jsonp: "callback", jsonpCallback: function() { - var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( ajax_nonce++ ) ); + var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) ); this[ callback ] = true; return callback; } @@ -32,7 +39,7 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) { if ( jsonProp ) { s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName ); } else if ( s.jsonp !== false ) { - s.url += ( ajax_rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName; + s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName; } // Use data converter to retrieve json after script execution @@ -78,3 +85,5 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) { return "script"; } }); + +}); |