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

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index f797e1a..ffd870c 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -1,4 +1,4 @@
-var jsc = now(),
+var jsc = jQuery.now(),
        rscript = /<script(.|\s)*?\/script>/gi,
        rselectTextarea = /select|textarea/i,
        rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,
@@ -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 );
                                }
@@ -259,7 +266,7 @@ jQuery.extend({
                }
 
                if ( s.cache === false && type === "GET" ) {
-                       var ts = now();
+                       var ts = jQuery.now();
 
                        // try replacing _= if it is there
                        var ret = s.url.replace(rts, "$1_=" + ts + "$2");
@@ -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();
                                }