library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jeresig 2010-03-02 10:44:48 -05:00
parent a33d01a7b0
commit 86ace44fbb
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ajax.js
View File

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