github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-04-20 03:01:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplifies how url is kept devoid of anti-cache parameter for ifModified requests. Also, renames ifModifiedKey to cacheURL so that it now conveys the variable's nature rather than its purpose. -5 min/gzipped.

Browse Source
This commit is contained in:
jaubourg
2012-11-29 17:16:42 +01:00
parent 6378a19c46
commit 8a79be7894
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ajax.js
View File

@@ -317,8 +317,8 @@ jQuery.extend({
options = options || {};
var transport,
// ifModified key
ifModifiedKey,
// URL without anti-cache param
cacheURL,
// Response headers
responseHeadersString,
responseHeaders,
@@ -474,39 +474,39 @@ jQuery.extend({
// Determine if request has content
s.hasContent = !rnoContent.test( s.type );
// Save the URL in case we're toying with the If-Modified-Since
// and/or If-None-Match header later on
cacheURL = s.url;
// More options handling for requests with no content
if ( !s.hasContent ) {
// If data is available, append data to url
if ( s.data ) {
s.url += ( ajax_rquery.test( s.url ) ? "&" : "?" ) + s.data;
cacheURL = ( s.url += ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
// #9682: remove data so that it's not used in an eventual retry
delete s.data;
}
// Get ifModifiedKey before adding the anti-cache parameter
ifModifiedKey = s.url;
// Add anti-cache in url if needed
if ( s.cache === false ) {
s.url = rts.test( ifModifiedKey ) ?
s.url = rts.test( cacheURL ) ?
// If there is already a '_' parameter, set its value
ifModifiedKey.replace( rts, "$1_=" + ajax_nonce++ ) :
cacheURL.replace( rts, "$1_=" + ajax_nonce++ ) :
// Otherwise add one to the end
ifModifiedKey + ( ajax_rquery.test( ifModifiedKey ) ? "&" : "?" ) + "_=" + ajax_nonce++;
cacheURL + ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ajax_nonce++;
}
}
// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
if ( s.ifModified ) {
ifModifiedKey = ifModifiedKey || s.url;
if ( jQuery.lastModified[ ifModifiedKey ] ) {
jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
if ( jQuery.lastModified[ cacheURL ] ) {
jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
}
if ( jQuery.etag[ ifModifiedKey ] ) {
jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
if ( jQuery.etag[ cacheURL ] ) {
jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
}
}
@@ -617,11 +617,11 @@ jQuery.extend({
if ( s.ifModified ) {
modified = jqXHR.getResponseHeader("Last-Modified");
if ( modified ) {
jQuery.lastModified[ ifModifiedKey ] = modified;
jQuery.lastModified[ cacheURL ] = modified;
}
modified = jqXHR.getResponseHeader("etag");
if ( modified ) {
jQuery.etag[ ifModifiedKey ] = modified;
jQuery.etag[ cacheURL ] = modified;
}
}