From 92c3d87a9cdd611af06e46a5e66a4876c2be5ed0 Mon Sep 17 00:00:00 2001 From: jaubourg Date: Wed, 19 Jan 2011 16:55:26 +0100 Subject: [PATCH] Moved ajaxSettings.xhr definition together with support.ajax and support.cors determination into ajax/xhr.js. --- src/ajax.js | 32 ------ src/ajax/xhr.js | 302 +++++++++++++++++++++++++++++++------------------------ 2 files changed, 173 insertions(+), 161 deletions(-) diff --git a/src/ajax.js b/src/ajax.js index 871481d..43bab7c 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -182,9 +182,6 @@ jQuery.extend({ headers: {}, crossDomain: null, */ - xhr: function() { - return new window.XMLHttpRequest(); - }, accepts: { xml: "application/xml, text/xml", @@ -977,33 +974,4 @@ function determineDataType( s , ct , text , xml ) { return response; } -/* - * Create the request object; Microsoft failed to properly - * implement the XMLHttpRequest in IE7 (can't request local files), - * so we use the ActiveXObject when it is available - * Additionally XMLHttpRequest can be disabled in IE7/IE8 so - * we need a fallback. - */ -if ( window.ActiveXObject ) { - jQuery.ajaxSettings.xhr = function() { - if ( window.location.protocol !== "file:" ) { - try { - return new window.XMLHttpRequest(); - } catch( xhrError ) {} - } - - try { - return new window.ActiveXObject("Microsoft.XMLHTTP"); - } catch( activeError ) {} - }; -} - -var testXHR = jQuery.ajaxSettings.xhr(); - -// Does this browser support XHR requests? -jQuery.support.ajax = !!testXHR; - -// Does this browser support crossDomain XHR requests -jQuery.support.cors = testXHR && "withCredentials" in testXHR; - })( jQuery ); diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js index 34aa832..0f30469 100644 --- a/src/ajax/xhr.js +++ b/src/ajax/xhr.js @@ -7,177 +7,221 @@ var // Next active xhr id xhrs = {}, // #5280: see below - xhrUnloadAbortInstalled; + xhrUnloadAbortInstalled, + // XHR used to determine supports properties + testXHR; -jQuery.ajaxTransport( function( s , determineDataType ) { +// Create the request object; Microsoft failed to properly +// (This is still attached to ajaxSettings for backward compatibility reasons) +jQuery.ajaxSettings.xhr = window.ActiveXObject ? + /* Microsoft failed to properly + * implement the XMLHttpRequest in IE7 (can't request local files), + * so we use the ActiveXObject when it is available + * Additionally XMLHttpRequest can be disabled in IE7/IE8 so + * we need a fallback. + */ + function() { + if ( window.location.protocol !== "file:" ) { + try { + return new window.XMLHttpRequest(); + } catch( xhrError ) {} + } - // Cross domain only allowed if supported through XMLHttpRequest - if ( ! s.crossDomain || jQuery.support.cors ) { + try { + return new window.ActiveXObject("Microsoft.XMLHTTP"); + } catch( activeError ) {} + } : + // For all other browsers, use the standard XMLHttpRequest object + function() { + return new window.XMLHttpRequest(); + }; - var callback; +// Test if we can create an xhr object +try { + testXHR = jQuery.ajaxSettings.xhr(); +} catch( xhrCreationException ) {} - return { +//Does this browser support XHR requests? +jQuery.support.ajax = !!testXHR; - send: function(headers, complete) { +// Does this browser support crossDomain XHR requests +jQuery.support.cors = testXHR && "withCredentials" in testXHR; - // #5280: we need to abort on unload or IE will keep connections alive - if ( ! xhrUnloadAbortInstalled ) { +// No need for the temporary xhr anymore +testXHR = undefined; - xhrUnloadAbortInstalled = 1; +// Create transport if the browser can provide an xhr +if ( jQuery.support.ajax ) { + jQuery.ajaxTransport( function( s , determineDataType ) { - jQuery(window).bind( "unload" , function() { + // Cross domain only allowed if supported through XMLHttpRequest + if ( ! s.crossDomain || jQuery.support.cors ) { - // Abort all pending requests - jQuery.each(xhrs, function(_, xhr) { - if ( xhr.onreadystatechange ) { - xhr.onreadystatechange( 1 ); - } - }); + var callback; - }); - } + return { - // Get a new xhr - var xhr = s.xhr(), - handle; + send: function(headers, complete) { - // Open the socket - // Passing null username, generates a login popup on Opera (#2865) - if ( s.username ) { - xhr.open(s.type, s.url, s.async, s.username, s.password); - } else { - xhr.open(s.type, s.url, s.async); - } + // #5280: we need to abort on unload or IE will keep connections alive + if ( ! xhrUnloadAbortInstalled ) { - // Requested-With header - // Not set for crossDomain requests with no content - // (see why at http://trac.dojotoolkit.org/ticket/9486) - // Won't change header if already provided - if ( ! ( s.crossDomain && ! s.hasContent ) && ! headers["x-requested-with"] ) { - headers["x-requested-with"] = "XMLHttpRequest"; - } + xhrUnloadAbortInstalled = 1; + + jQuery(window).bind( "unload" , function() { - // Need an extra try/catch for cross domain requests in Firefox 3 - try { + // Abort all pending requests + jQuery.each(xhrs, function(_, xhr) { + if ( xhr.onreadystatechange ) { + xhr.onreadystatechange( 1 ); + } + }); - jQuery.each(headers, function(key,value) { - xhr.setRequestHeader(key,value); - }); + }); + } - } catch(_) {} + // Get a new xhr + var xhr = s.xhr(), + handle; - // Do send the request - try { - xhr.send( ( s.hasContent && s.data ) || null ); - } catch(e) { - complete(0, "error", "" + e); - return; - } + // Open the socket + // Passing null username, generates a login popup on Opera (#2865) + if ( s.username ) { + xhr.open(s.type, s.url, s.async, s.username, s.password); + } else { + xhr.open(s.type, s.url, s.async); + } - // Listener - callback = function( _ , isAbort ) { + // Requested-With header + // Not set for crossDomain requests with no content + // (see why at http://trac.dojotoolkit.org/ticket/9486) + // Won't change header if already provided + if ( ! ( s.crossDomain && ! s.hasContent ) && ! headers["x-requested-with"] ) { + headers["x-requested-with"] = "XMLHttpRequest"; + } - // Was never called and is aborted or complete - if ( callback && ( isAbort || xhr.readyState === 4 ) ) { + // Need an extra try/catch for cross domain requests in Firefox 3 + try { - // Only called once - callback = 0; + jQuery.each(headers, function(key,value) { + xhr.setRequestHeader(key,value); + }); - // Do not keep as active anymore - // and store back into pool - if (handle) { - xhr.onreadystatechange = jQuery.noop; - delete xhrs[ handle ]; - } + } catch(_) {} - // If it's an abort - if ( isAbort ) { + // Do send the request + try { + xhr.send( ( s.hasContent && s.data ) || null ); + } catch(e) { + complete(0, "error", "" + e); + return; + } - // Abort it manually if needed - if ( xhr.readyState !== 4 ) { - xhr.abort(); + // Listener + callback = function( _ , isAbort ) { + + // Was never called and is aborted or complete + if ( callback && ( isAbort || xhr.readyState === 4 ) ) { + + // Only called once + callback = 0; + + // Do not keep as active anymore + // and store back into pool + if (handle) { + xhr.onreadystatechange = jQuery.noop; + delete xhrs[ handle ]; } - } else { - // Get info - var status = xhr.status, - statusText, - response, - responseHeaders = xhr.getAllResponseHeaders(); + // If it's an abort + if ( isAbort ) { - try { // Firefox throws an exception when accessing statusText for faulty cross-domain requests + // Abort it manually if needed + if ( xhr.readyState !== 4 ) { + xhr.abort(); + } + } else { - statusText = xhr.statusText; + // Get info + var status = xhr.status, + statusText, + response, + responseHeaders = xhr.getAllResponseHeaders(); - } catch( e ) { + try { // Firefox throws an exception when accessing statusText for faulty cross-domain requests - statusText = ""; // We normalize with Webkit giving an empty statusText + statusText = xhr.statusText; - } + } catch( e ) { - // Filter status for non standard behaviours - // (so many they seem to be the actual "standard") - status = - // Opera returns 0 when it should be 304 - // Webkit returns 0 for failing cross-domain no matter the real status - status === 0 ? - ( - ! s.crossDomain || statusText ? // Webkit, Firefox: filter out faulty cross-domain requests + statusText = ""; // We normalize with Webkit giving an empty statusText + + } + + // Filter status for non standard behaviours + // (so many they seem to be the actual "standard") + status = + // Opera returns 0 when it should be 304 + // Webkit returns 0 for failing cross-domain no matter the real status + status === 0 ? ( - responseHeaders ? // Opera: filter out real aborts #6060 - 304 + ! s.crossDomain || statusText ? // Webkit, Firefox: filter out faulty cross-domain requests + ( + responseHeaders ? // Opera: filter out real aborts #6060 + 304 + : + 0 + ) : - 0 + 302 // We assume 302 but could be anything cross-domain related ) : - 302 // We assume 302 but could be anything cross-domain related - ) - : - ( - status == 1223 ? // IE sometimes returns 1223 when it should be 204 (see #1450) - 204 - : - status - ); - - // Guess response & update dataType accordingly - response = - determineDataType( - s, - xhr.getResponseHeader("content-type"), - xhr.responseText, - xhr.responseXML ); - - // Call complete - complete(status,statusText,response,responseHeaders); + ( + status == 1223 ? // IE sometimes returns 1223 when it should be 204 (see #1450) + 204 + : + status + ); + + // Guess response & update dataType accordingly + response = + determineDataType( + s, + xhr.getResponseHeader("content-type"), + xhr.responseText, + xhr.responseXML ); + + // Call complete + complete(status,statusText,response,responseHeaders); + } } - } - }; + }; - // if we're in sync mode - // or it's in cache and has been retrieved directly (IE6 & IE7) - // we need to manually fire the callback - if ( ! s.async || xhr.readyState === 4 ) { + // if we're in sync mode + // or it's in cache and has been retrieved directly (IE6 & IE7) + // we need to manually fire the callback + if ( ! s.async || xhr.readyState === 4 ) { - callback(); + callback(); - } else { + } else { - // Add to list of active xhrs - handle = xhrId++; - xhrs[ handle ] = xhr; - xhr.onreadystatechange = callback; - } - }, + // Add to list of active xhrs + handle = xhrId++; + xhrs[ handle ] = xhr; + xhr.onreadystatechange = callback; + } + }, - abort: function() { - if ( callback ) { - callback(0,1); + abort: function() { + if ( callback ) { + callback(0,1); + } } - } - }; - } -}); + }; + } + }); +} })( jQuery ); -- 1.7.10.4