Skip to content

Commit e43be28

Browse files
committed
fix review changes, mostly remove dead comments
1 parent 97880df commit e43be28

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

modules/default/calendar/calendar.js

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ Module.register("calendar", {
422422
timeWrapper.innerHTML = CalendarUtils.capFirst(moment(event.startDate, "x").format(this.config.dateFormat));
423423
// Add end time if showEnd
424424
if (this.config.showEnd) {
425-
// andhas a duation
425+
// and has a duation
426426
if (event.startDate !== event.endDate) {
427427
timeWrapper.innerHTML += "-";
428428
timeWrapper.innerHTML += CalendarUtils.capFirst(moment(event.endDate, "x").format(this.config.dateEndFormat));
@@ -473,18 +473,18 @@ Module.register("calendar", {
473473
if (event.startDate >= now || (event.fullDayEvent && this.eventEndingWithinNextFullTimeUnit(event, ONE_DAY))) {
474474
// Use relative time
475475
if (!this.config.hideTime && !event.fullDayEvent) {
476-
Log.info("event not hidden and not fullday");
477-
timeWrapper.innerHTML = `${CalendarUtils.capFirst(moment(event.startDate, "x").calendar(null, { sameElse: this.config.dateFormat }))}`; // A ${event.startDate};
476+
Log.debug("event not hidden and not fullday");
477+
timeWrapper.innerHTML = `${CalendarUtils.capFirst(moment(event.startDate, "x").calendar(null, { sameElse: this.config.dateFormat }))}`;
478478
} else {
479-
Log.info("event full day or hidden");
479+
Log.debug("event full day or hidden");
480480
timeWrapper.innerHTML = `${CalendarUtils.capFirst(
481481
moment(event.startDate, "x").calendar(null, {
482482
sameDay: this.config.showTimeToday ? "LT" : `[${this.translate("TODAY")}]`,
483483
nextDay: `[${this.translate("TOMORROW")}]`,
484484
nextWeek: "dddd",
485485
sameElse: event.fullDayEvent ? this.config.fullDayEventDateFormat : this.config.dateFormat
486486
})
487-
)}`; // B ${event.startDate};
487+
)}`;
488488
}
489489
if (event.fullDayEvent) {
490490
// Full days events within the next two days
@@ -507,7 +507,7 @@ Module.register("calendar", {
507507
} else if (event.startDate - now < this.config.getRelative * ONE_HOUR) {
508508
Log.info("not full day but within getrelative size");
509509
// If event is within getRelative hours, display 'in xxx' time format or moment.fromNow()
510-
timeWrapper.innerHTML = `${CalendarUtils.capFirst(moment(event.startDate, "x").fromNow())}`; // C ${event.startDate};
510+
timeWrapper.innerHTML = `${CalendarUtils.capFirst(moment(event.startDate, "x").fromNow())}`;
511511
}
512512
} else {
513513
// Ongoing event
@@ -638,9 +638,6 @@ Module.register("calendar", {
638638
if (this.config.hideDuplicates && this.listContainsEvent(events, event)) {
639639
continue;
640640
}
641-
//if (--remainingEntries < 0) {
642-
// break;
643-
//}
644641
}
645642

646643
event.url = calendarUrl;
@@ -695,9 +692,9 @@ Module.register("calendar", {
695692
by_url_calevents.sort(function (a, b) {
696693
return a.startDate - b.startDate;
697694
});
698-
Log.info(`pushing ${by_url_calevents.length} events to total with room for ${remainingEntries}`);
695+
Log.debug(`pushing ${by_url_calevents.length} events to total with room for ${remainingEntries}`);
699696
events = events.concat(by_url_calevents.slice(0, remainingEntries));
700-
Log.info(`events for calendar=${events.length}`);
697+
Log.debug(`events for calendar=${events.length}`);
701698
}
702699
Log.info(`sorting events count=${events.length}`);
703700
events.sort(function (a, b) {
@@ -910,8 +907,6 @@ Module.register("calendar", {
910907
let p = this.getCalendarProperty(url, property, defaultValue);
911908
if (property === "symbol" || property === "recurringSymbol" || property === "fullDaySymbol") {
912909
const className = this.getCalendarProperty(url, "symbolClassName", this.config.defaultSymbolClassName);
913-
//if (p instanceof Array) p.push(className);
914-
//else
915910
p = className + p;
916911
}
917912

tests/electron/modules/calendar_spec.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
const helpers = require("../helpers/global-setup");
2-
//const stdMocks = require('std-mocks')
3-
4-
//stdMocks.use();
52

63
describe("Calendar module", () => {
74

0 commit comments

Comments
 (0)