X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fxhr.js;h=97db07951d6b8b653f53e8dd5d56114caf3f616d;hb=ee22a59129e082a2bb9f5bc0b085191ab6faafc8;hp=3acdc66a667c248e565a239ae837e418935f2953;hpb=5ef7ddc4c55f49cb7767bba99975f2c7ea5422d9;p=jquery.git

diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index 3acdc66..97db079 100644
--- a/src/ajax/xhr.js
+++ b/src/ajax/xhr.js
@@ -1,5 +1,18 @@
 (function( jQuery ) {
 
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject("Microsoft.XMLHTTP");
+	} catch( e ) {}
+}
+
 var // Next active xhr id
 	xhrId = jQuery.now(),
 
@@ -10,7 +23,11 @@ var // Next active xhr id
 	xhrUnloadAbortInstalled,
 
 	// XHR used to determine supports properties
-	testXHR;
+	testXHR,
+
+	// Keep track of isLocal in case it gets removed
+	// from ajaxSettings later on
+	protocolIsLocal = jQuery.ajaxSettings.isLocal;
 
 // Create the request object
 // (This is still attached to ajaxSettings for backward compatibility)
@@ -21,28 +38,17 @@ jQuery.ajaxSettings.xhr = window.ActiveXObject ?
 	 * 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 ) {}
+	( protocolIsLocal ?
+		createActiveXHR :
+		function() {
+			return createStandardXHR() || createActiveXHR();
 		}
-
-		try {
-			return new window.ActiveXObject("Microsoft.XMLHTTP");
-		} catch( activeError ) {}
-	} :
+	) :
 	// 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
@@ -85,13 +91,6 @@ if ( jQuery.support.ajax ) {
 						handle,
 						i;
 
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
-						}
-					}
-
 					// Open the socket
 					// Passing null username, generates a login popup on Opera (#2865)
 					if ( s.username ) {
@@ -100,6 +99,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)
@@ -175,30 +181,29 @@ 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;
+									// 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( protocolIsLocal ) {
+											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 ) {