library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects 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

26
src/ajax.js
View File

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