X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=3c199af95ba7b49d00317d2f4d269194557ba081;hb=812a247dc997fa09583c0557c6173f9ec58e7d60;hp=193a85ae04075dac0514fd126b1bd4290ff6d854;hpb=44e6beb10304789044de2c5a58f5bb82e8321636;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 193a85a..3c199af 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -390,14 +390,17 @@ jQuery.extend({
 
 		// Wait for a response to come back
 		var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
-			// The request was aborted, clear the interval and decrement jQuery.active
+			// The request was aborted
 			if ( !xhr || xhr.readyState === 0 ) {
-				requestDone = true;
-				xhr.onreadystatechange = jQuery.noop;
+				// Opera doesn't call onreadystatechange before this point
+				// so we simulate the call
+				if ( !requestDone ) {
+					complete();
+				}
 
-				// Handle the global AJAX counter
-				if ( s.global && ! --jQuery.active ) {
-					jQuery.event.trigger( "ajaxStop" );
+				requestDone = true;
+				if ( xhr ) {
+					xhr.onreadystatechange = jQuery.noop;
 				}
 
 			// The transfer is complete and the data is available, or the request timed out
@@ -447,6 +450,22 @@ jQuery.extend({
 			}
 		};
 
+		// Override the abort handler, if we can (IE doesn't allow it, but that's OK)
+		// Opera doesn't fire onreadystatechange at all on abort
+		try {
+			var oldAbort = xhr.abort;
+			xhr.abort = function() {
+				if ( xhr ) {
+					oldAbort.call( xhr );
+					if ( xhr ) {
+						xhr.readyState = 0;
+					}
+				}
+
+				onreadystatechange();
+			};
+		} catch(e) { }
+
 		// Timeout checker
 		if ( s.async && s.timeout > 0 ) {
 			setTimeout(function() {
@@ -459,7 +478,7 @@ jQuery.extend({
 
 		// Send the data
 		try {
-			xhr.send( type === "POST" || type === "PUT" ? s.data : null );
+			xhr.send( type === "POST" || type === "PUT" || type === "DELETE" ? s.data : null );
 		} catch(e) {
 			jQuery.handleError(s, xhr, null, e);
 			// Fire the complete handlers
@@ -646,7 +665,7 @@ jQuery.extend({
 						}
 					});
 					
-				} else if ( !traditional && typeof obj === "object" ) {
+				} else if ( !traditional && obj != null && typeof obj === "object" ) {
 					// Serialize object item.
 					jQuery.each( obj, function( k, v ) {
 						buildParams( prefix + "[" + k + "]", v );