diff options
| author | John Resig <jeresig@gmail.com> | 2010-10-09 16:25:55 -0400 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2010-10-09 16:25:55 -0400 |
| commit | 9b655a176b0d045c3773357761acf2fa93cd9650 (patch) | |
| tree | 709f1da508c5277771e86825373e6504934e7de9 /src | |
| parent | b0dcc1746f58f5aca17a12794dd928c0deaaa6a0 (diff) | |
| parent | d2e64979bf641181443a8e6456f6292973a7fa9a (diff) | |
| download | jquery-9b655a176b0d045c3773357761acf2fa93cd9650.tar.gz jquery-9b655a176b0d045c3773357761acf2fa93cd9650.zip | |
Merge branch 'bug7018' of http://github.com/csnover/jquery into csnover-bug7018
Diffstat (limited to 'src')
| -rw-r--r-- | src/ajax.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ajax.js b/src/ajax.js index 95e40ecd2..bd9fb455a 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 ); } |