diff options
| author | John Resig <jeresig@gmail.com> | 2007-07-20 18:58:22 +0000 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2007-07-20 18:58:22 +0000 |
| commit | a40f141f23a3e3addcfae71676ff187f139eb8cb (patch) | |
| tree | a57833fd57113f4cfbfff7ad50b8397a63c168a7 /src | |
| parent | 3604d14896568ecdaaa232dc12380a56fa7c4b0c (diff) | |
| download | jquery-a40f141f23a3e3addcfae71676ff187f139eb8cb.tar.gz jquery-a40f141f23a3e3addcfae71676ff187f139eb8cb.zip | |
Made the error message equal to "timeout", if the request timed out. (Bug #970)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ajax/ajax.js | 6 |
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 { |