Merge branch 'bug7422' of https://github.com/csnover/jquery into csno…

…ver-bug7422
jquery · Nov 9, 2010 · aa74396 · aa74396
2 parents fb48ae8 + e57b73a
commit aa74396
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/ajax.js b/src/ajax.js
@@ -463,10 +463,11 @@ jQuery.extend({
 		try {
 			var oldAbort = xhr.abort;
 			xhr.abort = function() {
-				// xhr.abort in IE7 is not a native JS function
+				if ( xhr ) {
-				// and does not have a call property
+					// oldAbort has no call property in IE7 so
-				if ( xhr && oldAbort.call ) {
+					// just do it this way, which works in all
-					oldAbort.call( xhr );
+					// browsers
+					Function.prototype.call.call( oldAbort, xhr );
 				}
 
 				onreadystatechange( "abort" );

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
@@ -137,7 +137,7 @@ test(".load()) - 404 error callbacks", function() {
 });
 
 test("jQuery.ajax() - abort", function() {
-	expect( 6 );
+	expect( 8 );
 	stop();
 
 	jQuery('#foo').ajaxStart(function(){
@@ -157,7 +157,10 @@ test("jQuery.ajax() - abort", function() {
 		complete: function(){ ok(true, "complete"); }
 	});
 
+	equals( xhr.readyState, 1, "XHR readyState indicates successful dispatch" );
+
 	xhr.abort();
+	equals( xhr.readyState, 0, "XHR readyState indicates successful abortion" );
 });
 
 test("Ajax events with context", function() {