aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjaubourg <j@ubourg.net>2011-01-28 17:08:46 +0100
committerjaubourg <j@ubourg.net>2011-01-28 17:08:46 +0100
commitbbd3f4f3fe66fc4ce6c6db31a17a1c04037323be (patch)
tree576d4993ec887cd69f7bbe79ffbcc6fdbb775ce1 /src
parent1e4f3c07c70861fc334a0e61080f8bbde0d7d442 (diff)
downloadjquery-bbd3f4f3fe66fc4ce6c6db31a17a1c04037323be.tar.gz
jquery-bbd3f4f3fe66fc4ce6c6db31a17a1c04037323be.zip
Compatibility fixes in ajax: exceptions are no longer promoted to strings before being given to callbacks. Updated misleading comment in conversion code.
Diffstat (limited to 'src')
-rw-r--r--src/ajax.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ajax.js b/src/ajax.js
index d8af93874..383ba2b1f 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -472,7 +472,7 @@ jQuery.extend({
} catch(e) {
// We have a parsererror
statusText = "parsererror";
- error = "" + e;
+ error = e;
}
}
} else {
@@ -662,7 +662,7 @@ jQuery.extend({
} 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 );
@@ -849,7 +849,7 @@ function ajaxConvert( s, response ) {
conversion,
// Conversion function
conv,
- // Conversion functions (when text is used in-between)
+ // Conversion functions (transitive conversion)
conv1,
conv2;