From: malsup <malsup@gmail.com>
Date: Thu, 29 Apr 2010 03:45:34 +0000 (+0800)
Subject: Fix for http://dev.jquery.com/ticket/6451
X-Git-Tag: 1.4.3rc1~164
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d1931a8241dcac1617cc8388f6dd6284c89c545d;p=jquery.git

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

diff --git a/src/ajax.js b/src/ajax.js
index 7cf280ab3..ffd870c28 100644
--- a/src/ajax.js
+++ b/src/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();
 				}
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index be4b3f021..fe44ba3b6 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -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 );
+});
+
+
 }
 
 //}