deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed bug #165 (ignoring the exception) and #156 (ifModified option added to $.ajax)

Browse source
This commit is contained in:
Jörn Zaefferer 2006-10-01 14:32:29 +00:00
parent e94db76ada
commit 08d865862a
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/ajax/ajax.js
View file

@ -537,6 +537,10 @@ jQuery.extend({
* (String) dataType - The type of data that you're expecting back from * (String) dataType - The type of data that you're expecting back from
* the server (e.g. "xml", "html", "script", or "json"). * the server (e.g. "xml", "html", "script", or "json").
* *
* (Boolean) ifModified - Allow the request to be successful only if the
* response has changed since the last request, default is false, ignoring
* the Last-Modified header
*
* (Number) timeout - Local timeout to override global timeout, eg. to give a * (Number) timeout - Local timeout to override global timeout, eg. to give a
* single request a longer timeout while all others timeout after 1 seconds, * single request a longer timeout while all others timeout after 1 seconds,
* see $.ajaxTimeout * see $.ajaxTimeout
@ -610,6 +614,7 @@ jQuery.extend({
var dataType = type.dataType; var dataType = type.dataType;
var global = typeof type.global == "boolean" ? type.global : true; var global = typeof type.global == "boolean" ? type.global : true;
var timeout = typeof type.timeout == "number" ? type.timeout : jQuery.timeout; var timeout = typeof type.timeout == "number" ? type.timeout : jQuery.timeout;
var ifModified = type.ifModified || false;
data = type.data; data = type.data;
url = type.url; url = type.url;
type = type.type; type = type.type;
@ -655,8 +660,13 @@ jQuery.extend({
// Make sure that the request was successful or notmodified // Make sure that the request was successful or notmodified
if ( status != "error" ) { if ( status != "error" ) {
// Cache Last-Modified header, if ifModified mode. // Cache Last-Modified header, if ifModified mode.
var modRes = xml.getResponseHeader("Last-Modified"); var modRes;
if ( ifModified && modRes ) jQuery.lastModified[url] = modRes; try {
modRes = xml.getResponseHeader("Last-Modified");
} catch(e) {} // swallow exception thrown by FF if header is not available
if ( ifModified && modRes )
jQuery.lastModified[url] = modRes;
// If a local callback was specified, fire it // If a local callback was specified, fire it
if ( success ) if ( success )