Made the error message equal to "timeout", if the request timed out. (Bug #970)
authorJohn Resig <jeresig@gmail.com>
Fri, 20 Jul 2007 18:58:22 +0000 (18:58 +0000)
committerJohn Resig <jeresig@gmail.com>
Fri, 20 Jul 2007 18:58:22 +0000 (18:58 +0000)
src/ajax/ajax.js

index 4fb63c0..65ae119 100644 (file)
@@ -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 {