git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed several ajaxSettings options. Removed cors test, fixed failing cors test.
[jquery.git]
/
src
/
transports
/
jsonp.js
diff --git
a/src/transports/jsonp.js
b/src/transports/jsonp.js
index
f16b394
..
aa30b5d
100644
(file)
--- a/
src/transports/jsonp.js
+++ b/
src/transports/jsonp.js
@@
-70,7
+70,7
@@
jQuery.ajax.prefilter("json jsonp", 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.converters["script json"] = function() {
if ( ! responseContainer ) {
jQuery.error( jsonpCallback + " was not called" );
}
if ( ! responseContainer ) {
jQuery.error( jsonpCallback + " was not called" );
}