aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjaubourg <j@ubourg.net>2010-12-25 23:00:25 +0100
committerjaubourg <j@ubourg.net>2010-12-31 04:13:42 +0100
commit2a5c16f217416a7cb5afce72a0f25c66d074fc0c (patch)
treec9fb62ad84b271ff3be27e6a7ab807b9f8860f3e
parent981d1e08eb00f4b5c29ad1f3977a45e30c93ad70 (diff)
downloadjquery-2a5c16f217416a7cb5afce72a0f25c66d074fc0c.tar.gz
jquery-2a5c16f217416a7cb5afce72a0f25c66d074fc0c.zip
Revised logic in data conversion to account for when dataFilter modifies the dataTypes list.
-rw-r--r--src/ajax.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ajax.js b/src/ajax.js
index 347273d15..7c0e1018d 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -415,6 +415,8 @@ jQuery.extend({
if ( i ) {
+ prev = dataTypes[ i - 1 ];
+
if ( prev !== "*" && current !== "*" && prev !== current ) {
oneConv = conv1 =
@@ -440,8 +442,6 @@ jQuery.extend({
response = s.dataFilter( response );
dataTypes = s.dataTypes;
}
-
- prev = current;
}
// We have a real success