Merge branch 'bug7018' of http://github.com/csnover/jquery into csnover-bug7018
authorJohn Resig <jeresig@gmail.com>
Sat, 9 Oct 2010 20:25:55 +0000 (16:25 -0400)
committerJohn Resig <jeresig@gmail.com>
Sat, 9 Oct 2010 20:25:55 +0000 (16:25 -0400)
src/ajax.js

index 95e40ec..bd9fb45 100644 (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
                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 );
                                }