Skip to content

J
jquery
Commit a40f141f authored by John Resig's avatar John Resig
Browse files
Options

Made the error message equal to "timeout", if the request timed out. (Bug #970)

parent 3604d148
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/ajax/ajax.js
View file @ a40f141f
...@@ -655,10 +655,10 @@ jQuery.extend({ ...@@ -655,10 +655,10 @@ jQuery.extend({
var status; var status;
try { try {
status = jQuery.httpSuccess( xml ) && isTimeout != "timeout" ? status = isTimeout || (jQuery.httpSuccess( xml ) ?
s.ifModified && jQuery.httpNotModified( xml, s.url ) ? "notmodified" : "success" : "error"; 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. // Cache Last-Modified header, if ifModified mode.
var modRes; var modRes;
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment