Merge branch 'bug7018' of http://github.com/csnover/jquery into csnover-bug7018

This commit is contained in:
John Resig 2010-10-09 16:25:55 -04:00
commit 9b655a176b

View file

@ -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 // Opera doesn't fire onreadystatechange at all on abort
try { try {
var oldAbort = xhr.abort; var oldAbort = xhr.abort;
xhr.abort = function() { 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 ); oldAbort.call( xhr );
} }