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

diff --git a/src/ajax.js b/src/ajax.js
index 7cf280ab33ab60f94f0bbbfc358ffde1cac25857..ffd870c284e854aa710a9f7dcf53672209919d4b 100644 (file)
--- 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 be4b3f0219b656356737aaf6eb6598f03de46864..fe44ba3b619ca88f92efbca238d7f441e8f4e440 100644 (file)
--- 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 );
+});
+
+
 }
 
 //}