Made the error message equal to "timeout", if the request timed out. …

…(Bug #970)
jquery · Jul 20, 2007 · a40f141 · a40f141
1 parent 3604d14
commit a40f141
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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 {