X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=e5fb5c4bcc123236db88acf62df2424e4e21a0e3;hb=1cecfa1ece0d48b253fb0775bba645c464e363a4;hp=3d1f9a377dfcc44dc1cb0b6bcf07c4a1e0250c2e;hpb=d343bfe528cbb8b08c3beb94cb33d1c444932f06;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 3d1f9a3..e5fb5c4 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -229,7 +229,53 @@ jQuery.extend({
 
 			// Parse text as xml
 			"text xml": jQuery.parseXML
+		},
+
+		// Utility function that handles dataType when response is received
+		// (for those transports that can give text or xml responses)
+		determineDataType: function( ct , text , xml ) {
+
+			var s = this,
+				contents = s.contents,
+				type,
+				regexp,
+				dataTypes = s.dataTypes,
+				transportDataType = dataTypes[0],
+				response;
+
+			// Auto (xml, json, script or text determined given headers)
+			if ( transportDataType === "*" ) {
+
+				for ( type in contents ) {
+					if ( ( regexp = contents[ type ] ) && regexp.test( ct ) ) {
+						transportDataType = dataTypes[0] = type;
+						break;
+					}
+				}
+			}
+
+			// xml and parsed as such
+			if ( transportDataType === "xml" &&
+				xml &&
+				xml.documentElement /* #4958 */ ) {
+
+				response = xml;
+
+			// Text response was provided
+			} else {
+
+				response = text;
+
+				// If it's not really text, defer to converters
+				if ( transportDataType !== "text" ) {
+					dataTypes.unshift( "text" );
+				}
+
+			}
+
+			return response;
 		}
+
 	},
 
 	// Main method
@@ -345,7 +391,7 @@ jQuery.extend({
 
 			// Dereference transport for early garbage collection
 			// (no matter how long the jXHR transport will be used
-			transport = 0;
+			transport = undefined;
 
 			// Set readyState
 			jXHR.readyState = status ? 4 : 0;
@@ -368,7 +414,12 @@ jQuery.extend({
 				// Stored success
 				success,
 				// Stored error
-				error;
+				error,
+
+				// Keep track of statusCode callbacks
+				oldStatusCode = statusCode;
+
+			statusCode = undefined;
 
 			// If successful, handle type chaining
 			if ( status >= 200 && status < 300 || status === 304 ) {
@@ -410,6 +461,8 @@ jQuery.extend({
 							current,
 							// Previous dataType
 							prev,
+							// Conversion expression
+							conversion,
 							// Conversion function
 							conv,
 							// Conversion functions (when text is used in-between)
@@ -448,8 +501,8 @@ jQuery.extend({
 								if ( prev !== "*" && current !== "*" && prev !== current ) {
 
 									// Get the converter
-									conv = converters[ prev + " " + current ] ||
-										converters[ "* " + current ];
+									conversion = prev + " " + current;
+									conv = converters[ conversion ] || converters[ "* " + current ];
 
 									conv1 = conv2 = 0;
 
@@ -524,7 +577,7 @@ jQuery.extend({
 			}
 
 			// Status-dependent callbacks
-			jXHR.statusCode( statusCode );
+			jXHR.statusCode( oldStatusCode );
 
 			if ( s.global ) {
 				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) ,
@@ -552,20 +605,14 @@ jQuery.extend({
 		// Status-dependent callbacks
 		jXHR.statusCode = function( map ) {
 			if ( map ) {
-				var resolved = jXHR.isResolved(),
-					tmp;
-				if ( resolved || jXHR.isRejected() ) {
-					tmp = map[ jXHR.status ];
-					if ( tmp ) {
-						if ( map === statusCode ) {
-							delete statusCode[ jXHR.status ];
-						}
-						jXHR[ resolved ? "done" : "fail" ]( tmp );
-					}
-				} else {
+				var tmp;
+				if ( statusCode ) {
 					for( tmp in map ) {
 						statusCode[ tmp ] = [ statusCode[ tmp ] , map[ tmp ] ];
 					}
+				} else {
+					tmp = map[ jXHR.status ];
+					jXHR.done( tmp ).fail( tmp );
 				}
 			}
 			return this;
@@ -669,7 +716,7 @@ jQuery.extend({
 			}
 
 			// Get transport
-			transport = jQuery.ajaxTransport( s );
+			transport = jQuery.ajaxTransport( s , options );
 
 			// If no transport, we auto-abort
 			if ( ! transport ) {
@@ -802,7 +849,7 @@ jQuery.extend({
 });
 
 //Execute or select from functions in a given structure of options
-function ajax_selectOrExecute( structure , s ) {
+function ajax_selectOrExecute( structure , s , options ) {
 
 	var dataTypes = s.dataTypes,
 		transportDataType,
@@ -840,7 +887,7 @@ function ajax_selectOrExecute( structure , s ) {
 
 		} else {
 
-			selected = list[ i ]( s , determineDataType );
+			selected = list[ i ]( s , options );
 
 			// If we got redirected to another dataType
 			// Search there (if not in progress or already tried)
@@ -875,7 +922,7 @@ function ajax_addElement( structure , args ) {
 		first = jQuery.type( args[ 0 ] );
 
 		if ( first === "object" ) {
-			return ajax_selectOrExecute( structure , args[ 0 ] );
+			return ajax_selectOrExecute( structure , args[ 0 ] , args[ 1 ] );
 		}
 
 		structure = jQuery.ajaxSettings[ structure ];
@@ -923,48 +970,4 @@ jQuery.each( [ "Prefilter" , "Transport" ] , function( _ , name ) {
 	};
 } );
 
-// Utility function that handles dataType when response is received
-// (for those transports that can give text or xml responses)
-function determineDataType( s , ct , text , xml ) {
-
-	var contents = s.contents,
-		type,
-		regexp,
-		dataTypes = s.dataTypes,
-		transportDataType = dataTypes[0],
-		response;
-
-	// Auto (xml, json, script or text determined given headers)
-	if ( transportDataType === "*" ) {
-
-		for ( type in contents ) {
-			if ( ( regexp = contents[ type ] ) && regexp.test( ct ) ) {
-				transportDataType = dataTypes[0] = type;
-				break;
-			}
-		}
-	}
-
-	// xml and parsed as such
-	if ( transportDataType === "xml" &&
-		xml &&
-		xml.documentElement /* #4958 */ ) {
-
-		response = xml;
-
-	// Text response was provided
-	} else {
-
-		response = text;
-
-		// If it's not really text, defer to converters
-		if ( transportDataType !== "text" ) {
-			dataTypes.unshift( "text" );
-		}
-
-	}
-
-	return response;
-}
-
 })( jQuery );