merge of '57d4b2a3ccb82fb9075fec4638adcd3bbb16ae4d'

and 'cd845bf5330077e8801634336d85db1dd1834d50'

Monotone-Parent: 57d4b2a3ccb82fb9075fec4638adcd3bbb16ae4d
Monotone-Parent: cd845bf5330077e8801634336d85db1dd1834d50
Monotone-Revision: 76b92aaa0be7118096a3287bc24849f4e5b6c795

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-04-26T16:01:39
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2010-04-26 16:01:39 +00:00
+17 -19
View File
@@ -936,26 +936,24 @@ function changeDateSelectorDisplay(day, keepCurrentDay) {
url += "?day=" + day;
}
if (day != currentDay) {
if (!keepCurrentDay)
currentDay = day;
var month = day.substr(0, 6);
if (cachedDateSelectors[month]) {
// log ("restoring cached selector for month: " + month);
setDateSelectorContent(cachedDateSelectors[month]);
}
else {
// log ("loading selector for month: " + month);
if (document.dateSelectorAjaxRequest) {
document.dateSelectorAjaxRequest.aborted = true;
document.dateSelectorAjaxRequest.abort();
}
document.dateSelectorAjaxRequest
= triggerAjaxRequest(url,
dateSelectorCallback,
month);
if (!keepCurrentDay)
currentDay = day;
var month = day.substr(0, 6);
if (cachedDateSelectors[month]) {
// log ("restoring cached selector for month: " + month);
setDateSelectorContent(cachedDateSelectors[month]);
}
else {
// log ("loading selector for month: " + month);
if (document.dateSelectorAjaxRequest) {
document.dateSelectorAjaxRequest.aborted = true;
document.dateSelectorAjaxRequest.abort();
}
document.dateSelectorAjaxRequest
= triggerAjaxRequest(url,
dateSelectorCallback,
month);
}
}