Skip to content

Commit

Permalink
Moving more properties onto jQuery.ajax, also copy them back to the j…
Browse files Browse the repository at this point in the history
…Query object for backwards compatibility.
  • Loading branch information
jeresig committed Mar 2, 2010
1 parent a33d01a commit 86ace44
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions src/ajax.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 ) ) {
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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]);
}
}

Expand Down Expand Up @@ -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 ) {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -673,3 +673,6 @@ jQuery.extend( jQuery.ajax, {
}

});

// For backwards compatibility
jQuery.extend( jQuery.ajax );

This comment has been minimized.

Copy link
@malsup

malsup Apr 10, 2010

Contributor

What's the benefit of factoring methods out of the jQuery namespace only to slam them back in? Also, this won't hold up for the primitive 'active' property.

This comment has been minimized.

Copy link
@codenothing

codenothing Apr 12, 2010

Malsup - To free up those methods for third-party plugins to use that namespace I would assume.

1 comment on commit 86ace44

@davidmurdoch
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In lines 350 and 351 jQuery.lastModified should be changed to jQuery.ajax.lastModified. Right?

Please sign in to comment.