Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Moving more properties onto jQuery.ajax, also copy them back to the j…
…Query object for backwards compatibility.
- Loading branch information
Showing
1 changed file
with
12 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 ); | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
codenothing
|
1 comment
on commit 86ace44
There was a problem hiding this comment.
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?
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.