Merge branch 'calendar' into reminders
commit
231d5ebd24
|
@ -1322,7 +1322,7 @@ define([
|
|||
var $start = $(start);
|
||||
var $end = $(end);
|
||||
// XXX new Date().toLocaleString('fr-fr', {month: 'long'}).replace(/./, c => c.toUpperCase())
|
||||
var is24h = false
|
||||
var is24h = false;
|
||||
try {
|
||||
is24h = !new Intl.DateTimeFormat(navigator.language, { hour: 'numeric' }).format(0).match(/AM/);
|
||||
} catch (e) {}
|
||||
|
|
|
@ -226,8 +226,6 @@ Messages.calendar_dateTimeRange = "{0} {1} - {2}";
|
|||
timegridDisplayTime: getTime,
|
||||
timegridDisplayPrimaryTime: getTime,
|
||||
popupDetailDate: function(isAllDay, start, end) {
|
||||
var isSameDate = +start._date === +end._date;
|
||||
|
||||
var startDate = start._date.toLocaleDateString();
|
||||
var endDate = end._date.toLocaleDateString();
|
||||
if (isAllDay) {
|
||||
|
|
Loading…
Reference in New Issue