kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-03 22:36:09 +00:00
Code Issues Projects Releases Wiki Activity

poinst of time when calendar event gets relative now customizable

Browse Source
This commit is contained in:
Jens 2016-09-03 23:17:46 +02:00 committed by GitHub
parent c1b8fc1233
commit 8f4effbb8d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/default/calendar/calendar.js
View File

@ -23,6 +23,7 @@ Module.register("calendar",{
fade: true, fade: true,
urgency: 7, urgency: 7,
timeFormat: "relative", timeFormat: "relative",
getRelative: '6',
fadePoint: 0.25, // Start on 1/4th of the list. fadePoint: 0.25, // Start on 1/4th of the list.
calendars: [ calendars: [
{ {
@ -179,7 +180,7 @@ Module.register("calendar",{
if (event.startDate >= new Date()) { if (event.startDate >= new Date()) {
if (event.startDate - now < 2 * one_day) { if (event.startDate - now < 2 * one_day) {
// This event is within the next 48 hours (2 days) // This event is within the next 48 hours (2 days)
if (event.startDate - now < 6 * one_hour) { if (event.startDate - now < this.config.getRelative * one_hour) {
// If event is within 6 hour, display 'in xxx' time format or moment.fromNow() // If event is within 6 hour, display 'in xxx' time format or moment.fromNow()
timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow()); timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
} else { } else {