From: jeresig <jeresig@gmail.com>
Date: Tue, 2 Mar 2010 15:44:48 +0000 (-0500)
Subject: Moving more properties onto jQuery.ajax, also copy them back to the jQuery object... 
X-Git-Tag: 1.4.3rc1~184
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=86ace44fbbdfe90d231877d6d3bb3b85a81782b4;p=jquery.git

Moving more properties onto jQuery.ajax, also copy them back to the jQuery object for backwards compatibility.
---

diff --git a/src/ajax.js b/src/ajax.js
index 360c87c4a..f797e1a78 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -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();
@@ -355,8 +351,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]);
 				}
 			}
 
@@ -567,6 +563,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 +631,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 +673,6 @@ jQuery.extend( jQuery.ajax, {
 	}
 
 });
+
+// For backwards compatibility
+jQuery.extend( jQuery.ajax );