git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes abort in prefilter. No global event will be fired in that case even if the...
[jquery.git]
/
src
/
ajax
/
jsonp.js
diff --git
a/src/ajax/jsonp.js
b/src/ajax/jsonp.js
index
ebc660f
..
2691591
100644
(file)
--- a/
src/ajax/jsonp.js
+++ b/
src/ajax/jsonp.js
@@
-12,7
+12,7
@@
jQuery.ajaxSetup({
});
// Detect, normalize options and install callbacks for jsonp requests
});
// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jXHR ) {
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
var dataIsString = ( typeof s.data === "string" );
var dataIsString = ( typeof s.data === "string" );
@@
-60,7
+60,7
@@
jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jXHR ) {
};
// Install cleanUp function
};
// Install cleanUp function
- jXHR.then( cleanUp, cleanUp );
+ jqXHR.then( cleanUp, cleanUp );
// Use data converter to retrieve json after script execution
s.converters["script json"] = function() {
// Use data converter to retrieve json after script execution
s.converters["script json"] = function() {