deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
John Resig 2010-11-09 12:40:55 -05:00
parent fb48ae8e6c e57b73a0ac
commit aa74396976
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ajax.js
View file

@ -463,10 +463,11 @@ jQuery.extend({
try { try {
var oldAbort = xhr.abort; var oldAbort = xhr.abort;
xhr.abort = function() { xhr.abort = function() {
// xhr.abort in IE7 is not a native JS function if ( xhr ) {
// and does not have a call property // oldAbort has no call property in IE7 so
if ( xhr && oldAbort.call ) { // just do it this way, which works in all
oldAbort.call( xhr ); // browsers
Function.prototype.call.call( oldAbort, xhr );
} }
onreadystatechange( "abort" ); onreadystatechange( "abort" );

5
test/unit/ajax.js
View file

@ -137,7 +137,7 @@ test(".load()) - 404 error callbacks", function() {
}); });
test("jQuery.ajax() - abort", function() { test("jQuery.ajax() - abort", function() {
expect( 6 ); expect( 8 );
stop(); stop();
jQuery('#foo').ajaxStart(function(){ jQuery('#foo').ajaxStart(function(){
@ -157,7 +157,10 @@ test("jQuery.ajax() - abort", function() {
complete: function(){ ok(true, "complete"); } complete: function(){ ok(true, "complete"); }
}); });
equals( xhr.readyState, 1, "XHR readyState indicates successful dispatch" );
xhr.abort(); xhr.abort();
equals( xhr.readyState, 0, "XHR readyState indicates successful abortion" );
}); });
test("Ajax events with context", function() { test("Ajax events with context", function() {