We were catching exceptions within the success callback of an Ajax request,...

We were catching exceptions within the success callback of an Ajax request, then causing an error callback to be called (which is incorrect). (Bug #1441)

src/ajax/ajax.js

@@ -631,15 +631,23 @@ jQuery.extend({
 					ival = null;
 				}
 				
-				var status;
-				try {
-					status = isTimeout == "timeout" && "timeout" ||
+				var status = isTimeout == "timeout" && "timeout" ||
 					!jQuery.httpSuccess( xml ) && "error" ||
 					s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" ||
 					"success";
 
+				if ( status == "success" ) {
+					// Watch for, and catch, XML document parse errors
+					try {
+						// process the data (runs the xml through httpData regardless of callback)
+						var data = jQuery.httpData( xml, s.dataType );
+					} catch(e) {
+						status = "parsererror";
+					}
+				}
+
 				// Make sure that the request was successful or notmodified
-					if ( status != "error" && status != "timeout" ) {
+				if ( status == "success" ) {
 					// Cache Last-Modified header, if ifModified mode.
 					var modRes;
 					try {
@@ -649,9 +657,6 @@ jQuery.extend({
 					if ( s.ifModified && modRes )
 						jQuery.lastModified[s.url] = modRes;
 	
-						// process the data (runs the xml through httpData regardless of callback)
-						var data = jQuery.httpData( xml, s.dataType );
-	
 					// If a local callback was specified, fire it and pass it the data
 					if ( s.success )
 						s.success( data, status );
@@ -661,10 +666,6 @@ jQuery.extend({
 						jQuery.event.trigger( "ajaxSuccess", [xml, s] );
 				} else
 					jQuery.handleError(s, xml, status);
-				} catch(e) {
-					status = "parsererror";
-					jQuery.handleError(s, xml, status, e);
-				}
 
 				// The request was completed
 				if( s.global )