Skip to content

J
jquery
Commit 92c3d87a authored by jaubourg's avatar jaubourg
Browse files
Options

Moved ajaxSettings.xhr definition together with support.ajax and support.cors... 

Moved ajaxSettings.xhr definition together with support.ajax and support.cors determination into ajax/xhr.js.
parent 265cf0ef
Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 161 deletions
src/ajax.js
View file @ 92c3d87a
...@@ -182,9 +182,6 @@ jQuery.extend({ ...@@ -182,9 +182,6 @@ jQuery.extend({
headers: {}, headers: {},
crossDomain: null, crossDomain: null,
*/ */
xhr: function() {
return new window.XMLHttpRequest();
},
accepts: { accepts: {
xml: "application/xml, text/xml", xml: "application/xml, text/xml",
...@@ -977,33 +974,4 @@ function determineDataType( s , ct , text , xml ) { ...@@ -977,33 +974,4 @@ function determineDataType( s , ct , text , xml ) {
return response; 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 ); })( jQuery );
src/ajax/xhr.js
View file @ 92c3d87a
...@@ -7,177 +7,221 @@ var // Next active xhr id ...@@ -7,177 +7,221 @@ var // Next active xhr id
xhrs = {}, xhrs = {},
// #5280: see below // #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 try {
if ( ! s.crossDomain || jQuery.support.cors ) { 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 // No need for the temporary xhr anymore
if ( ! xhrUnloadAbortInstalled ) { 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 var callback;
jQuery.each(xhrs, function(_, xhr) {
if ( xhr.onreadystatechange ) {
xhr.onreadystatechange( 1 );
}
});
}); return {
}
// Get a new xhr send: function(headers, complete) {
var xhr = s.xhr(),
handle;
// Open the socket // #5280: we need to abort on unload or IE will keep connections alive
// Passing null username, generates a login popup on Opera (#2865) if ( ! xhrUnloadAbortInstalled ) {
if ( s.username ) {
xhr.open(s.type, s.url, s.async, s.username, s.password);
} else {
xhr.open(s.type, s.url, s.async);
}
// Requested-With header xhrUnloadAbortInstalled = 1;
// Not set for crossDomain requests with no content
// (see why at http://trac.dojotoolkit.org/ticket/9486) jQuery(window).bind( "unload" , function() {
// Won't change header if already provided
if ( ! ( s.crossDomain && ! s.hasContent ) && ! headers["x-requested-with"] ) {
headers["x-requested-with"] = "XMLHttpRequest";
}
// Need an extra try/catch for cross domain requests in Firefox 3 // Abort all pending requests
try { 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 // Open the socket
try { // Passing null username, generates a login popup on Opera (#2865)
xhr.send( ( s.hasContent && s.data ) || null ); if ( s.username ) {
} catch(e) { xhr.open(s.type, s.url, s.async, s.username, s.password);
complete(0, "error", "" + e); } else {
return; xhr.open(s.type, s.url, s.async);
} }
// Listener // Requested-With header
callback = function( _ , isAbort ) { // 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 // Need an extra try/catch for cross domain requests in Firefox 3
if ( callback && ( isAbort || xhr.readyState === 4 ) ) { try {
// Only called once jQuery.each(headers, function(key,value) {
callback = 0; xhr.setRequestHeader(key,value);
});
// Do not keep as active anymore } catch(_) {}
// and store back into pool
if (handle) {
xhr.onreadystatechange = jQuery.noop;
delete xhrs[ handle ];
}
// If it's an abort // Do send the request
if ( isAbort ) { try {
xhr.send( ( s.hasContent && s.data ) || null );
} catch(e) {
complete(0, "error", "" + e);
return;
}
// Abort it manually if needed // Listener
if ( xhr.readyState !== 4 ) { callback = function( _ , isAbort ) {
xhr.abort();
// 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 // If it's an abort
var status = xhr.status, if ( isAbort ) {
statusText,
response,
responseHeaders = xhr.getAllResponseHeaders();
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 statusText = ""; // We normalize with Webkit giving an empty statusText
// (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 // Filter status for non standard behaviours
status === 0 ? // (so many they seem to be the actual "standard")
( status =
! s.crossDomain || statusText ? // Webkit, Firefox: filter out faulty cross-domain requests // 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 ! s.crossDomain || statusText ? // Webkit, Firefox: filter out faulty cross-domain requests
304 (
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 == 1223 ? // IE sometimes returns 1223 when it should be 204 (see #1450) status
204 );
:
status // Guess response & update dataType accordingly
); response =
determineDataType(
// Guess response & update dataType accordingly s,
response = xhr.getResponseHeader("content-type"),
determineDataType( xhr.responseText,
s, xhr.responseXML );
xhr.getResponseHeader("content-type"),
xhr.responseText, // Call complete
xhr.responseXML ); complete(status,statusText,response,responseHeaders);
}
// Call complete
complete(status,statusText,response,responseHeaders);
} }
} };
};
// if we're in sync mode // if we're in sync mode
// or it's in cache and has been retrieved directly (IE6 & IE7) // or it's in cache and has been retrieved directly (IE6 & IE7)
// we need to manually fire the callback // we need to manually fire the callback
if ( ! s.async || xhr.readyState === 4 ) { if ( ! s.async || xhr.readyState === 4 ) {
callback(); callback();
} else { } else {
// Add to list of active xhrs // Add to list of active xhrs
handle = xhrId++; handle = xhrId++;
xhrs[ handle ] = xhr; xhrs[ handle ] = xhr;
xhr.onreadystatechange = callback; xhr.onreadystatechange = callback;
} }
}, },
abort: function() { abort: function() {
if ( callback ) { if ( callback ) {
callback(0,1); callback(0,1);
}
} }
} };
}; }
} });
}); }
})( jQuery ); })( jQuery );
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