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

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 360c87c..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,
@@ -83,6 +83,7 @@ jQuery.fn.extend({
        serialize: function() {
                return jQuery.param(this.serializeArray());
        },
+
        serializeArray: function() {
                return this.map(function() {
                        return this.elements ? jQuery.makeArray(this.elements) : this;
@@ -114,7 +115,6 @@ jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".sp
 });
 
 jQuery.extend({
-
        get: function( url, data, callback, type ) {
                // shift arguments if data argument was omited
                if ( jQuery.isFunction( data ) ) {
@@ -198,10 +198,6 @@ jQuery.extend({
                }
        },
 
-       // Last-Modified header cache for next request
-       lastModified: {},
-       etag: {},
-
        ajax: function( origSettings ) {
                var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings),
                        jsonp, status, data, type = s.type.toUpperCase();
@@ -241,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 );
                                }
@@ -263,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");
@@ -355,8 +358,8 @@ jQuery.extend({
                                        xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
                                }
 
-                               if ( jQuery.etag[s.url] ) {
-                                       xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
+                               if ( jQuery.ajax.etag[s.url] ) {
+                                       xhr.setRequestHeader("If-None-Match", jQuery.ajax.etag[s.url]);
                                }
                        }
 
@@ -440,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();
                                }
@@ -567,6 +571,10 @@ jQuery.extend( jQuery.ajax, {
        // Counter for holding the number of active queries
        active: 0,
 
+       // Last-Modified header cache for next request
+       lastModified: {},
+       etag: {},
+
        handleError: function( s, xhr, status, e ) {
                // If a local callback was specified, fire it
                if ( s.error ) {
@@ -631,11 +639,11 @@ jQuery.extend( jQuery.ajax, {
                        etag = xhr.getResponseHeader("Etag");
 
                if ( lastModified ) {
-                       jQuery.lastModified[url] = lastModified;
+                       jQuery.ajax.lastModified[url] = lastModified;
                }
 
                if ( etag ) {
-                       jQuery.etag[url] = etag;
+                       jQuery.ajax.etag[url] = etag;
                }
 
                // Opera returns 0 when status is 304
@@ -673,3 +681,6 @@ jQuery.extend( jQuery.ajax, {
        }
 
 });
+
+// For backwards compatibility
+jQuery.extend( jQuery.ajax );