X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ftransports%2Fjsonp.js;h=aa30b5dda93ab44d8f15bf68850fcdd4c450f154;hb=8c9d32723a8943d4595eb5e04be8f891a8ff7a7f;hp=6c9fb704e02b4ce4ebdce6d5fab4ad822a44cb5d;hpb=0daf7223d08e2da983179e37e6c422abe90d6b82;p=jquery.git diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js index 6c9fb70..aa30b5d 100644 --- a/src/transports/jsonp.js +++ b/src/transports/jsonp.js @@ -14,7 +14,7 @@ jQuery.ajaxSettings.jsonpCallback = function() { // 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("json jsonp", function(s) { +jQuery.ajax.prefilter("json jsonp", function(s) { var transportDataType = s.dataTypes[ 0 ]; @@ -70,18 +70,16 @@ jQuery.xhr.prefilter("json jsonp", function(s) { }, s.complete ]; // Use data converter to retrieve json after script execution - s.dataConverters["script => json"] = function() { + s.converters["script json"] = function() { if ( ! responseContainer ) { - jQuery.error("Callback '" + jsonpCallback + "' was not called"); + jQuery.error( jsonpCallback + " was not called" ); } return responseContainer[ 0 ]; }; // Delegate to script transport return "script"; - } - }); })( jQuery );