X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=645163ad20249eebdc1c31b6d5a102f606228692;hb=a8fa5f2ec1030bceb9a65d0237f0c92ae4e014dd;hp=c307ba50d6bcf7387bace1b99fd3c081acc362f5;hpb=97b244312e5dba9b28129006c9407ca80bb6c99b;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index c307ba5..645163a 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -161,6 +161,7 @@ jQuery.extend({
 
 	ajaxSetup: function( settings ) {
 		jQuery.extend( true, jQuery.ajaxSettings, settings );
+		return this;
 	},
 
 	ajaxSettings: {
@@ -265,6 +266,8 @@ jQuery.extend({
 			// Deferreds
 			deferred = jQuery.Deferred(),
 			completeDeferred = jQuery._Deferred(),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
 			// Headers (they are sent all at once)
 			requestHeaders = {},
 			// Response headers
@@ -365,17 +368,10 @@ jQuery.extend({
 				// Stored success
 				success,
 				// Stored error
-				error = statusText;
-
-			// If not timeout, force a jQuery-compliant status text
-			if ( statusText != "timeout" ) {
-				statusText = ( status >= 200 && status < 300 ) ?
-					"success" :
-					( status === 304 ? "notmodified" : "error" );
-			}
+				error;
 
 			// If successful, handle type chaining
-			if ( statusText === "success" || statusText === "notmodified" ) {
+			if ( status >= 200 && status < 300 || status === 304 ) {
 
 				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
 				if ( s.ifModified ) {
@@ -391,12 +387,20 @@ jQuery.extend({
 					}
 				}
 
-				if ( s.ifModified && statusText === "notmodified" ) {
+				// If not modified
+				if ( status === 304 ) {
 
-					success = null;
+					// Set the statusText accordingly
+					statusText = "notmodified";
+					// Mark as a success
 					isSuccess = 1;
 
+				// If we have data
 				} else {
+
+					// Set the statusText accordingly
+					statusText = "success";
+
 					// Chain data conversions and determine the final value
 					// (if an exception is thrown in the process, it'll be notified as an error)
 					try {
@@ -487,17 +491,20 @@ jQuery.extend({
 						success = response;
 						isSuccess = 1;
 
+					// If an exception was thrown
 					} catch(e) {
 
+						// We have a parsererror
 						statusText = "parsererror";
 						error = "" + e;
 
 					}
 				}
 
-			} else { // if not success, mark it as an error
+			// if not success, mark it as an error
+			} else {
 
-					error = error || statusText;
+					error = statusText = statusText || "error";
 
 					// Set responseText if needed
 					if ( response ) {
@@ -516,6 +523,9 @@ jQuery.extend({
 				deferred.fireReject( callbackContext , [ jXHR , statusText , error ] );
 			}
 
+			// Status-dependent callbacks
+			jXHR.statusCode( statusCode );
+
 			if ( s.global ) {
 				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) ,
 						[ jXHR , s , isSuccess ? success : error ] );
@@ -539,6 +549,28 @@ jQuery.extend({
 		jXHR.error = jXHR.fail;
 		jXHR.complete = completeDeferred.done;
 
+		// 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 {
+					for( tmp in map ) {
+						statusCode[ tmp ] = [ statusCode[ tmp ] , map[ tmp ] ];
+					}
+				}
+			}
+			return this;
+		};
+
 		// Remove hash character (#7531: and string promotion)
 		s.url = ( "" + s.url ).replace( rhash , "" );
 
@@ -568,7 +600,7 @@ jQuery.extend({
 		}
 
 		// Get transport
-		transport = jQuery.ajax.prefilter( s , options ).transport( s );
+		transport = jQuery.ajaxPrefilter( s , options ).ajaxTransport( s );
 
 		// Watch for a new set of requests
 		if ( s.global && jQuery.active++ === 0 ) {
@@ -818,7 +850,7 @@ function ajax_selectOrExecute( structure , s ) {
 		}
 	}
 
-	return noSelect ? jQuery.ajax : selected;
+	return noSelect ? jQuery : selected;
 }
 
 // Add an element to one of the structures in ajaxSettings
@@ -877,13 +909,13 @@ function ajax_addElement( structure , args ) {
 		}
 	}
 
-	return jQuery.ajax;
+	return jQuery;
 }
 
 // Install prefilter & transport methods
-jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
-	_ = name + "s";
-	jQuery.ajax[ name ] = function() {
+jQuery.each( [ "Prefilter" , "Transport" ] , function( _ , name ) {
+	_ = name.toLowerCase() + "s";
+	jQuery[ "ajax" + name ] = function() {
 		return ajax_addElement( _ , arguments );
 	};
 } );