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

Address review feedback

Browse Source
This commit is contained in:
Jon Kolb 2022-01-17 10:48:16 -05:00
parent 0aee42255f
commit e3857ca0f4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -477,10 +477,10 @@ Module.register("calendar", {
/** /**
* Creates the sorted list of all events. * Creates the sorted list of all events.
* *
* @param {boolean} forDisplay Whether to filter returned events for display. * @param {boolean} limitNumberOfEntries Whether to filter returned events for display.
* @returns {object[]} Array with events. * @returns {object[]} Array with events.
*/ */
createEventList: function (forDisplay) { createEventList: function (limitNumberOfEntries) {
const now = new Date(); const now = new Date();
const today = moment().startOf("day"); const today = moment().startOf("day");
const future = moment().startOf("day").add(this.config.maximumNumberOfDays, "days").toDate(); const future = moment().startOf("day").add(this.config.maximumNumberOfDays, "days").toDate();
@ -491,7 +491,7 @@ Module.register("calendar", {
for (const e in calendar) { for (const e in calendar) {
const event = JSON.parse(JSON.stringify(calendar[e])); // clone object const event = JSON.parse(JSON.stringify(calendar[e])); // clone object
if (event.endDate < now && forDisplay) { if (event.endDate < now && limitNumberOfEntries) {
continue; continue;
} }
if (this.config.hidePrivate) { if (this.config.hidePrivate) {
@ -500,7 +500,7 @@ Module.register("calendar", {
continue; continue;
} }
} }
if (this.config.hideOngoing && forDisplay) { if (this.config.hideOngoing && limitNumberOfEntries) {
if (event.startDate < now) { if (event.startDate < now) {
continue; continue;
} }
@ -549,7 +549,7 @@ Module.register("calendar", {
return a.startDate - b.startDate; return a.startDate - b.startDate;
}); });
if (!forDisplay) { if (!limitNumberOfEntries) {
return events; return events;
} }