X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=aa4e3ec450ec519621f24f72e0c154072f571a51;hb=ba9e0fc177841bd74cc5ea4e52f09cd87d747bf5;hp=2c4f13cb2c3b1992b19863668432b34ec7ee1f81;hpb=c90d609c0d10a8792b0b31e226592fd707f45570;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index 2c4f13c..aa4e3ec 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -1,3 +1,5 @@ +(function( jQuery ) { + var jsc = jQuery.now(), rscript = //gi, rselectTextarea = /select|textarea/i, @@ -627,9 +629,11 @@ 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:" || - // Opera returns 0 when status is 304 ( xhr.status >= 200 && xhr.status < 300 ) || - xhr.status === 304 || xhr.status === 1223 || xhr.status === 0; + 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(); } catch(e) {} return false; @@ -649,7 +653,7 @@ jQuery.extend( jQuery.ajax, { } // Opera returns 0 when status is 304 - return xhr.status === 304 || xhr.status === 0; + return xhr.status === 304 || xhr.status === 0 && !xhr.getAllResponseHeaders(); }, httpData: function( xhr, type, s ) { @@ -684,5 +688,10 @@ jQuery.extend( jQuery.ajax, { }); +// Does this browser support XHR requests? +jQuery.support.ajax = !!jQuery.ajaxSettings.xhr(); + // For backwards compatibility jQuery.extend( jQuery.ajax ); + +})( jQuery );