X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=src%2Fajax%2Fxhr.js;h=1f136c343ed6e690136fee095f602a0afbacb729;hp=c0368b95786d85d34b1d7d853af31a3b07376a40;hb=0c21c83e9691a08151f23a2c594568b07009f063;hpb=b90369e8cb2b6f3cc0afa34d815958ff0b605874 diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js index c0368b9..1f136c3 100644 --- a/src/ajax/xhr.js +++ b/src/ajax/xhr.js @@ -1,17 +1,35 @@ (function( jQuery ) { -var // Next active xhr id +var // #5280: next active xhr id and list of active xhrs' callbacks xhrId = jQuery.now(), - - // active xhrs - xhrs = {}, - - // #5280: see below - xhrUnloadAbortInstalled, + xhrCallbacks, // XHR used to determine supports properties testXHR; +// #5280: Internet Explorer will keep connections alive if we don't abort on unload +function xhrOnUnloadAbort() { + jQuery( window ).unload(function() { + // Abort all pending requests + for ( var key in xhrCallbacks ) { + xhrCallbacks[ key ]( 0, 1 ); + } + }); +} + +// Functions to create xhrs +function createStandardXHR() { + try { + return new window.XMLHttpRequest(); + } catch( e ) {} +} + +function createActiveXHR() { + try { + return new window.ActiveXObject("Microsoft.XMLHTTP"); + } catch( e ) {} +} + // Create the request object // (This is still attached to ajaxSettings for backward compatibility) jQuery.ajaxSettings.xhr = window.ActiveXObject ? @@ -22,27 +40,13 @@ jQuery.ajaxSettings.xhr = window.ActiveXObject ? * we need a fallback. */ function() { - if ( window.location.protocol !== "file:" ) { - try { - return new window.XMLHttpRequest(); - } catch( xhrError ) {} - } - - try { - return new window.ActiveXObject("Microsoft.XMLHTTP"); - } catch( activeError ) {} + return !this.isLocal && createStandardXHR() || createActiveXHR(); } : // For all other browsers, use the standard XMLHttpRequest object - function() { - return new window.XMLHttpRequest(); - }; + createStandardXHR; // Test if we can create an xhr object -try { - testXHR = jQuery.ajaxSettings.xhr(); -} catch( xhrCreationException ) {} - -//Does this browser support XHR requests? +testXHR = jQuery.ajaxSettings.xhr(); jQuery.support.ajax = !!testXHR; // Does this browser support crossDomain XHR requests @@ -63,26 +67,10 @@ if ( jQuery.support.ajax ) { return { send: function( headers, complete ) { - // #5280: we need to abort on unload or IE will keep connections alive - if ( !xhrUnloadAbortInstalled ) { - - xhrUnloadAbortInstalled = 1; - - jQuery(window).bind( "unload", function() { - - // Abort all pending requests - jQuery.each( xhrs, function( _, xhr ) { - if ( xhr.onreadystatechange ) { - xhr.onreadystatechange( 1 ); - } - } ); - - } ); - } - // Get a new xhr var xhr = s.xhr(), - handle; + handle, + i; // Open the socket // Passing null username, generates a login popup on Opera (#2865) @@ -92,6 +80,13 @@ if ( jQuery.support.ajax ) { xhr.open( s.type, s.url, s.async ); } + // Apply custom fields if provided + if ( s.xhrFields ) { + for ( i in s.xhrFields ) { + xhr[ i ] = s.xhrFields[ i ]; + } + } + // Requested-With header // Not set for crossDomain requests with no content // (see why at http://trac.dojotoolkit.org/ticket/9486) @@ -135,7 +130,7 @@ if ( jQuery.support.ajax ) { // Do not keep as active anymore if ( handle ) { xhr.onreadystatechange = jQuery.noop; - delete xhrs[ handle ]; + delete xhrCallbacks[ handle ]; } // If it's an abort @@ -145,7 +140,6 @@ if ( jQuery.support.ajax ) { xhr.abort(); } } else { - // Get info status = xhr.status; responseHeaders = xhr.getAllResponseHeaders(); responses = {}; @@ -167,30 +161,35 @@ if ( jQuery.support.ajax ) { } // Filter status for non standard behaviors - status = - // Most browsers return 0 when it should be 200 for local files - // Opera returns 0 when it should be 304 - // Webkit returns 0 for failing cross-domain no matter the real status - !status ? - // All: for local files, 0 is a success - ( location.protocol === "file:" ? 200 : ( - // Webkit, Firefox: filter out faulty cross-domain requests - !s.crossDomain || statusText ? - ( - // Opera: filter out real aborts #6060 - responseHeaders ? - 304 : - 0 - ) : - // We assume 302 but could be anything cross-domain related - 302 - ) ) : - ( - // IE sometimes returns 1223 when it should be 204 (see #1450) - status == 1223 ? - 204 : - status - ); + + // IE - #1450: sometimes returns 1223 when it should be 204 + if ( status === 1223 ) { + status = 204; + // Various - #8177: a Not Modified response was received + // yet no conditional request headers was provided + } else if ( status === 304 && + !headers[ "if-modified-since" ] && + !headers[ "if-none-match" ] ) { + status = 200; + // Status 0 encompasses several cases + } else if ( !status ) { + // Cross-domain + if ( s.crossDomain ) { + if ( !s.statusText ) { + // FF, Webkit (other?): There is no status text for errors + // 302 is the most generic cross-domain status code + // for errors, could be anything really (even a real 0) + status = 302; + } + // All same-domain: for local files, 0 is a success + } else if( s.isLocal ) { + status = 200; + // Opera: this notifies success for all requests + // (verified in 11.01). Patch welcome. + } + // Opera - #6060: sets status as 0 for 304 + // Patch welcome. + } } } } catch( firefoxAccessException ) { @@ -211,10 +210,15 @@ if ( jQuery.support.ajax ) { if ( !s.async || xhr.readyState === 4 ) { callback(); } else { - // Add to list of active xhrs + // Create the active xhrs callbacks list if needed + // and attach the unload handler + if ( !xhrCallbacks ) { + xhrCallbacks = {}; + xhrOnUnloadAbort(); + } + // Add to list of active xhrs callbacks handle = xhrId++; - xhrs[ handle ] = xhr; - xhr.onreadystatechange = callback; + xhr.onreadystatechange = xhrCallbacks[ handle ] = callback; } },