kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 04:02:12 +00:00
Code Issues Projects Releases Wiki Activity

Update calendar.js

Browse Source 
Small updates for travis cr check
This commit is contained in:
Dirk 2019-02-18 22:38:28 +01:00 committed by GitHub
parent a70716f225
commit 2b2e8508d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,13 +456,13 @@ Module.register("calendar", {
if (this.config.sliceMultiDayEvents) { if (this.config.sliceMultiDayEvents) {
var midnight = moment(event.startDate, "x").clone().startOf("day").add(1, "day").format("x"); //next midnight var midnight = moment(event.startDate, "x").clone().startOf("day").add(1, "day").format("x"); //next midnight
var count = 1; var count = 1;
var maxCount = Math.ceil(((event.endDate - 1) - moment(event.startDate, "x").endOf('day').format("x"))/(1000*60*60*24)) + 1 var maxCount = Math.ceil(((event.endDate - 1) - moment(event.startDate, "x").endOf("day").format("x"))/(1000*60*60*24)) + 1
if (event.endDate > midnight) { if (event.endDate > midnight) {
while (event.endDate > midnight) { while (event.endDate > midnight) {
var nextEvent = JSON.parse(JSON.stringify(event)); //make a copy without reference to the original event var nextEvent = JSON.parse(JSON.stringify(event)); //make a copy without reference to the original event
nextEvent.startDate = midnight; nextEvent.startDate = midnight;
event.endDate = midnight; event.endDate = midnight;
event.title += " ("+count+"/"+maxCount+")"; event.title += " (" + count + "/" + maxCount + ")";
events.push(event); events.push(event);
event = nextEvent; event = nextEvent;
count += 1; count += 1;