Skip to content
Permalink
Browse files

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

  • Loading branch information
malsup authored and jeresig committed Apr 29, 2010
1 parent 1533bf7 commit d1931a8241dcac1617cc8388f6dd6284c89c545d
Showing with 24 additions and 10 deletions.
  1. +18 −10 src/ajax.js
  2. +6 −0 test/unit/ajax.js
@@ -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 );
});


}

//}

0 comments on commit d1931a8

Please sign in to comment.
You can’t perform that action at this time.