X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fxhr.js;h=91a71de8d6aba61add0ebcb70f1bc4bc69e647ac;hb=4d808a3345f78fab963be96bf272951745b894e3;hp=d4c291fcbb17f21b9e03f2fa5c8fbe14c2979d6f;hpb=d77a2a2274d34033da8609a26c9cc1f2bd14c879;p=jquery.git

diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index d4c291f..91a71de 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(),
 
@@ -22,27 +35,13 @@ jQuery.ajaxSettings.xhr = window.ActiveXObject ?
 	 * we need a fallback.
 	 */
 	function() {
-		if ( !jQuery.ajaxSettings.isLocal ) {
-			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
@@ -85,13 +84,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 +92,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)
@@ -189,13 +188,14 @@ if ( jQuery.support.ajax ) {
 												// for errors, could be anything really (even a real 0)
 												status = 302;
 											}
-										// All same-domain - #8125, #8152: for local files, 0 is a success
+										// 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
-										// and there doesn't seem to be any way to
-										// detect this case. Patch VERY welcome.
+										// Patch welcome.
 									}
 								}
 							}