git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3604d14
)
Made the error message equal to "timeout", if the request timed out. (Bug #970)
author
John Resig
<jeresig@gmail.com>
Fri, 20 Jul 2007 18:58:22 +0000
(18:58 +0000)
committer
John Resig
<jeresig@gmail.com>
Fri, 20 Jul 2007 18:58:22 +0000
(18:58 +0000)
src/ajax/ajax.js
patch
|
blob
|
history
diff --git
a/src/ajax/ajax.js
b/src/ajax/ajax.js
index
4fb63c0
..
65ae119
100644
(file)
--- a/
src/ajax/ajax.js
+++ b/
src/ajax/ajax.js
@@
-655,10
+655,10
@@
jQuery.extend({
var status;
try {
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
// 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 {
// Cache Last-Modified header, if ifModified mode.
var modRes;
try {