aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjaubourg <j@ubourg.net>2010-12-25 23:00:25 +0100
committerjaubourg <j@ubourg.net>2010-12-25 23:00:25 +0100
commit85f0dda56289ed6c044dadb3a42b1a4d2ddb0891 (patch)
tree144493dc673a28f39369efcd2fb2f17d369ef3f7
parentf7ed2aca562620f9424b1667170352e798e99ef3 (diff)
downloadjquery-85f0dda56289ed6c044dadb3a42b1a4d2ddb0891.tar.gz
jquery-85f0dda56289ed6c044dadb3a42b1a4d2ddb0891.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 9f8e2384e..33c364509 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -430,6 +430,8 @@ jQuery.extend({
if ( i ) {
+ prev = dataTypes[ i - 1 ];
+
if ( prev !== "*" && current !== "*" && prev !== current ) {
oneConv = conv1 =
@@ -455,8 +457,6 @@ jQuery.extend({
response = s.dataFilter( response );
dataTypes = s.dataTypes;
}
-
- prev = current;
}
// We have a real success