aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ajax/ajax.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index 4fb63c0fd..65ae119f1 100644
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -655,10 +655,10 @@ jQuery.extend({
var status;
try {
- status = jQuery.httpSuccess( xml ) && isTimeout != "timeout" ?
- s.ifModified && jQuery.httpNotModified( xml, s.url ) ? "notmodified" : "success" : "error";
+ status = isTimeout || (jQuery.httpSuccess( xml ) ?
+ s.ifModified && jQuery.httpNotModified( xml, s.url ) ? "notmodified" : "success" : "error");
// Make sure that the request was successful or notmodified
- if ( status != "error" ) {
+ if ( status != "error" && status != "timeout" ) {
// Cache Last-Modified header, if ifModified mode.
var modRes;
try {