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

Fix for http://dev.jquery.com/ticket/6451

Browse source
This commit is contained in:
malsup 2010-04-29 11:45:34 +08:00 committed by John Resig
parent 1533bf7c77
commit d1931a8241
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ajax.js
View file

@ -237,16 +237,23 @@ jQuery.extend({
s.dataType = "script";
// Handle JSONP-style loading
window[ jsonp ] = window[ jsonp ] || function( tmp ) {
var customJsonp = window[ jsonp ];
window[ jsonp ] = function( tmp ) {
data = tmp;
jQuery.ajax.handleSuccess( s, xhr, status, data );
jQuery.ajax.handleComplete( s, xhr, status, data );
if ( jQuery.isFunction( customJsonp ) ) {
customJsonp( tmp );
}
else {
// Garbage collect
window[ jsonp ] = undefined;
try {
delete window[ jsonp ];
} catch( jsonpError ) {}
}
if ( head ) {
head.removeChild( script );
@ -436,8 +443,9 @@ jQuery.extend({
}
// Fire the complete handlers
if ( !jsonp ) {
jQuery.ajax.handleComplete( s, xhr, status, data );
}
if ( isTimeout === "timeout" ) {
xhr.abort();
}

6
test/unit/ajax.js
View file

@ -1225,6 +1225,12 @@ test("jQuery.ajax - Etag support", function() {
});
});
test("jQuery.ajax - active counter", function() {
ok( jQuery.ajax.active == 0, "ajax active counter should be zero: " + jQuery.ajax.active );
});
}
//}