Skip to content
Permalink
Browse files

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

…ver-bug7422
  • Loading branch information...
jeresig committed Nov 9, 2010
2 parents fb48ae8 + e57b73a commit aa743969763bde258fd16979c7205605ac6eae0f
Showing with 9 additions and 5 deletions.
  1. +5 −4 src/ajax.js
  2. +4 −1 test/unit/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
// and does not have a call property
if ( xhr && oldAbort.call ) {
oldAbort.call( xhr );
if ( xhr ) {
// oldAbort has no call property in IE7 so
// just do it this way, which works in all
// browsers
Function.prototype.call.call( oldAbort, xhr );
}

onreadystatechange( "abort" );
@@ -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() {

0 comments on commit aa74396

Please sign in to comment.
You can’t perform that action at this time.