X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ftransports%2Fjsonp.js;h=6c9fb704e02b4ce4ebdce6d5fab4ad822a44cb5d;hb=91d32e8f9699022ee468c060a24a43f947653f69;hp=d9e77f2f381cde0eeeb9a7882e5b9a6e83eea5e4;hpb=9e3f053c6568863251da20eba713d05f2bbdf9f0;p=jquery.git diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js index d9e77f2..6c9fb70 100644 --- a/src/transports/jsonp.js +++ b/src/transports/jsonp.js @@ -11,12 +11,14 @@ jQuery.ajaxSettings.jsonpCallback = function() { // Normalize jsonp queries // 1) put callback parameter in url or data -// 2) ensure transportDataType is json +// 2) sneakily ensure transportDataType is json // 3) ensure options jsonp is always provided so that jsonp requests are always // json request with the jsonp option set -jQuery.xhr.prefilter( function(s) { +jQuery.xhr.prefilter("json jsonp", function(s) { - var transportDataType = s.dataTypes[0]; + var transportDataType = s.dataTypes[ 0 ]; + + s.dataTypes[ 0 ] = "json"; if ( s.jsonp || transportDataType === "jsonp" || @@ -34,14 +36,10 @@ jQuery.xhr.prefilter( function(s) { s.url = url; s.data = data; - - s.dataTypes[0] = "json"; } -}); - // Bind transport to json dataType -jQuery.xhr.bindTransport("json", function(s) { +}).transport("json", function(s) { if ( s.jsonp ) {