git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed dataConverters key format.
[jquery.git]
/
src
/
transports
/
jsonp.js
diff --git
a/src/transports/jsonp.js
b/src/transports/jsonp.js
index
d9e77f2
..
a685bb1
100644
(file)
--- 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
// 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
// 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" ||
if ( s.jsonp ||
transportDataType === "jsonp" ||
@@
-34,14
+36,10
@@
jQuery.xhr.prefilter( function(s) {
s.url = url;
s.data = data;
s.url = url;
s.data = data;
-
- s.dataTypes[0] = "json";
}
}
-});
-
// Bind transport to json dataType
// Bind transport to json dataType
-jQuery.xhr.bindTransport("json", function(s) {
+}).transport("json", function(s) {
if ( s.jsonp ) {
if ( s.jsonp ) {
@@
-72,18
+70,16
@@
jQuery.xhr.bindTransport("json", function(s) {
}, s.complete ];
// Use data converter to retrieve json after script execution
}, s.complete ];
// Use data converter to retrieve json after script execution
- s.dataConverters["script => json"] = function() {
+ s.dataConverters["script json"] = function() {
if ( ! responseContainer ) {
if ( ! responseContainer ) {
- jQuery.error("Callback '" + jsonpCallback + "' was not called");
+ jQuery.error( jsonpCallback + " was not called" );
}
return responseContainer[ 0 ];
};
// Delegate to script transport
return "script";
}
return responseContainer[ 0 ];
};
// Delegate to script transport
return "script";
-
}
}
-
});
})( jQuery );
});
})( jQuery );