Fix reminders for all day events

pull/1/head
yflory 4 years ago
parent 1d9a05e782
commit a60e1078f9

@ -483,6 +483,9 @@ define([
var nowDateStr = new Date().toLocaleDateString(); var nowDateStr = new Date().toLocaleDateString();
var startDate = new Date(start); var startDate = new Date(start);
if (msg.isAllDay && msg.startDay) {
startDate = new Date(msg.startDay);
}
// Missed events // Missed events
if (start < now && missed) { if (start < now && missed) {
@ -493,9 +496,6 @@ define([
return Messages._getKey('reminder_now', [title]); return Messages._getKey('reminder_now', [title]);
} }
// In progress, is all day // In progress, is all day
// XXX fix this...
// XXX start and end time may not matter...
// XXX and timezone?
if (start < now && msg.isAllDay) { if (start < now && msg.isAllDay) {
return Messages._getKey('reminder_inProgressAllDay', [title]); return Messages._getKey('reminder_inProgressAllDay', [title]);
} }
@ -506,6 +506,11 @@ define([
// Not started yet // Not started yet
// No precise time for allDay events
if (msg.isAllDay) {
return Messages._getKey('reminder_date', [title, startDate.toLocaleDateString()]);
}
// In less than an hour: show countdown in minutes // In less than an hour: show countdown in minutes
if ((start - now) < 3600000) { if ((start - now) < 3600000) {
var minutes = Math.round((start - now) / 60000); var minutes = Math.round((start - now) / 60000);

Loading…
Cancel
Save