X-Git-Url: http://git.asbjorn.it/?p=jquery.git;a=blobdiff_plain;f=src%2Fajax%2Fxhr.js;h=5629dcd60b8fd671dce1fd5e9fbcd2b2960d3c42;hp=7a4da2ddb5fc4a685d94372d2c97194f57d9868f;hb=dd5bf421225d23bc8732a92ea82049859c0cd57a;hpb=30082d9eba66c3c919c9f8c5b97841568c443d68

diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index 7a4da2d..5629dcd 100644
--- a/src/ajax/xhr.js
+++ b/src/ajax/xhr.js
@@ -46,39 +46,38 @@ try {
 jQuery.support.ajax = !!testXHR;
 
 // Does this browser support crossDomain XHR requests
-jQuery.support.cors = testXHR && "withCredentials" in testXHR;
+jQuery.support.cors = testXHR && ( "withCredentials" in testXHR );
 
 // No need for the temporary xhr anymore
 testXHR = undefined;
 
 // Create transport if the browser can provide an xhr
 if ( jQuery.support.ajax ) {
-	jQuery.ajaxTransport( function( s ) {
 
+	jQuery.ajaxTransport(function( s ) {
 		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( ! s.crossDomain || jQuery.support.cors ) {
+		if ( !s.crossDomain || jQuery.support.cors ) {
 
 			var callback;
 
 			return {
-
-				send: function(headers, complete) {
+				send: function( headers, complete ) {
 
 					// #5280: we need to abort on unload or IE will keep connections alive
-					if ( ! xhrUnloadAbortInstalled ) {
+					if ( !xhrUnloadAbortInstalled ) {
 
 						xhrUnloadAbortInstalled = 1;
 
-						jQuery(window).bind( "unload" , function() {
+						jQuery(window).bind( "unload", function() {
 
 							// Abort all pending requests
-							jQuery.each(xhrs, function(_, xhr) {
+							jQuery.each( xhrs, function( _, xhr ) {
 								if ( xhr.onreadystatechange ) {
 									xhr.onreadystatechange( 1 );
 								}
-							});
+							} );
 
-						});
+						} );
 					}
 
 					// Get a new xhr
@@ -88,38 +87,36 @@ if ( jQuery.support.ajax ) {
 					// 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);
+						xhr.open( s.type, s.url, s.async, s.username, s.password );
 					} else {
-						xhr.open(s.type, s.url, s.async);
+						xhr.open( s.type, s.url, s.async );
 					}
 
 					// 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";
+					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
 					try {
-
-						jQuery.each(headers, function(key,value) {
-							xhr.setRequestHeader(key,value);
-						});
-
-					} catch(_) {}
+						jQuery.each( headers, function( key, value ) {
+							xhr.setRequestHeader( key, value );
+						} );
+					} catch( _ ) {}
 
 					// Do send the request
 					try {
 						xhr.send( ( s.hasContent && s.data ) || null );
-					} catch(e) {
-						complete(0, "error", "" + e);
+					} catch( e ) {
+						complete( 0, "error", "" + e );
 						return;
 					}
 
 					// Listener
-					callback = function( _ , isAbort ) {
+					callback = function( _, isAbort ) {
 
 						// Was never called and is aborted or complete
 						if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
@@ -128,20 +125,18 @@ if ( jQuery.support.ajax ) {
 							callback = 0;
 
 							// Do not keep as active anymore
-							if (handle) {
+							if ( handle ) {
 								xhr.onreadystatechange = jQuery.noop;
 								delete xhrs[ handle ];
 							}
 
 							// If it's an abort
 							if ( isAbort ) {
-
 								// Abort it manually if needed
 								if ( xhr.readyState !== 4 ) {
 									xhr.abort();
 								}
 							} else {
-
 								// Get info
 								var status = xhr.status,
 									statusText,
@@ -155,56 +150,51 @@ if ( jQuery.support.ajax ) {
 								}
 								responses.text = xhr.responseText;
 
-								try { // Firefox throws an exception when accessing statusText for faulty cross-domain requests
-
+								// Firefox throws an exception when accessing
+								// statusText for faulty cross-domain requests
+								try {
 									statusText = xhr.statusText;
-
 								} catch( e ) {
-
-									statusText = ""; // We normalize with Webkit giving an empty statusText
-
+									// We normalize with Webkit giving an empty statusText
+									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 ?
 										(
-											! s.crossDomain || statusText ? // Webkit, Firefox: filter out faulty cross-domain requests
+											// Webkit, Firefox: filter out faulty cross-domain requests
+											!s.crossDomain || statusText ?
 											(
-												responseHeaders ? // Opera: filter out real aborts #6060
-												304
-												:
+												// Opera: filter out real aborts #6060
+												responseHeaders ?
+												304 :
 												0
-											)
-											:
-											302 // We assume 302 but could be anything cross-domain related
-										)
-										:
+											) :
+											// We assume 302 but could be anything cross-domain related
+											302
+										) :
 										(
-											status == 1223 ?	// IE sometimes returns 1223 when it should be 204 (see #1450)
-												204
-												:
+											// IE sometimes returns 1223 when it should be 204 (see #1450)
+											status == 1223 ?
+												204 :
 												status
 										);
 
 								// Call complete
-								complete(status,statusText,responses,responseHeaders);
+								complete( status, statusText, responses, responseHeaders );
 							}
 						}
 					};
 
-					// if we're in sync mode
-					// or it's in cache and has been retrieved directly (IE6 & IE7)
+					// 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 ( !s.async || xhr.readyState === 4 ) {
 						callback();
-
 					} else {
-
 						// Add to list of active xhrs
 						handle = xhrId++;
 						xhrs[ handle ] = xhr;