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:
ba9e0fc
)
Scratch that, just punting on Opera and 304s for now - there may not be a good soluti...
author
John Resig
<jeresig@gmail.com>
Tue, 21 Sep 2010 20:13:50 +0000
(16:13 -0400)
committer
John Resig
<jeresig@gmail.com>
Tue, 21 Sep 2010 20:13:50 +0000
(16:13 -0400)
src/ajax.js
patch
|
blob
|
history
diff --git
a/src/ajax.js
b/src/ajax.js
index
aa4e3ec
..
bfae782
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-629,11
+629,8
@@
jQuery.extend( jQuery.ajax, {
try {
// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
return !xhr.status && location.protocol === "file:" ||
try {
// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
return !xhr.status && location.protocol === "file:" ||
- ( xhr.status >= 200 && xhr.status < 300 ) ||
- xhr.status === 304 || xhr.status === 1223 ||
- // Opera returns a status of 0 for redirects -
- // We can detect this by the fact that Opera also doesn't return any headers
- xhr.status === 0 && !xhr.getAllResponseHeaders();
+ xhr.status >= 200 && xhr.status < 300 ||
+ xhr.status === 304 || xhr.status === 1223;
} catch(e) {}
return false;
} catch(e) {}
return false;
@@
-652,8
+649,7
@@
jQuery.extend( jQuery.ajax, {
jQuery.ajax.etag[url] = etag;
}
jQuery.ajax.etag[url] = etag;
}
- // Opera returns 0 when status is 304
- return xhr.status === 304 || xhr.status === 0 && !xhr.getAllResponseHeaders();
+ return xhr.status === 304;
},
httpData: function( xhr, type, s ) {
},
httpData: function( xhr, type, s ) {