Commit d1931a82 authored by malsup's avatar malsup Committed by John Resig
parent 1533bf7c
......@@ -237,17 +237,24 @@ 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 );
// Garbage collect
window[ jsonp ] = undefined;
try {
delete window[ jsonp ];
} catch( jsonpError ) {}
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
jQuery.ajax.handleComplete( s, xhr, status, data );
if ( !jsonp ) {
jQuery.ajax.handleComplete( s, xhr, status, data );
}
if ( isTimeout === "timeout" ) {
xhr.abort();
}
......
......@@ -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 );
});
}
//}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment