From: John Resig Date: Sat, 9 Oct 2010 20:25:55 +0000 (-0400) Subject: Merge branch 'bug7018' of http://github.com/csnover/jquery into csnover-bug7018 X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=9b655a176b0d045c3773357761acf2fa93cd9650;hp=b0dcc1746f58f5aca17a12794dd928c0deaaa6a0 Merge branch 'bug7018' of github.com/csnover/jquery into csnover-bug7018 --- diff --git a/src/ajax.js b/src/ajax.js index 95e40ec..bd9fb45 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -458,12 +458,14 @@ jQuery.extend({ } }; - // Override the abort handler, if we can (IE doesn't allow it, but that's OK) + // Override the abort handler, if we can (IE 6 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 ) { + // xhr.abort in IE7 is not a native JS function + // and does not have a call property + if ( xhr && oldAbort.call ) { oldAbort.call( xhr ); }