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 potential collisions between jsonp requests from different jQuery instances...
[jquery.git]
/
src
/
ajax.js
diff --git
a/src/ajax.js
b/src/ajax.js
index
d8af938
..
383ba2b
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-472,7
+472,7
@@
jQuery.extend({
} catch(e) {
// We have a parsererror
statusText = "parsererror";
} catch(e) {
// We have a parsererror
statusText = "parsererror";
- error = "" + e;
+ error = e;
}
}
} else {
}
}
} else {
@@
-662,7
+662,7
@@
jQuery.extend({
} catch (e) {
// Propagate exception as error if not done
if ( status < 2 ) {
} catch (e) {
// Propagate exception as error if not done
if ( status < 2 ) {
- done( -1, "" + e );
+ done( -1, e );
// Simply rethrow otherwise
} else {
jQuery.error( e );
// Simply rethrow otherwise
} else {
jQuery.error( e );
@@
-849,7
+849,7
@@
function ajaxConvert( s, response ) {
conversion,
// Conversion function
conv,
conversion,
// Conversion function
conv,
- // Conversion functions (when text is used in-between)
+ // Conversion functions (transitive conversion)
conv1,
conv2;
conv1,
conv2;