From 8e4ba4fe93e0e104521ba5968724a2280c44d0e4 Mon Sep 17 00:00:00 2001 From: TheDuffman85 Date: Tue, 9 Feb 2021 13:01:57 +0100 Subject: [PATCH 1/3] Respect parameter ColoredSymbolOnly also for custom events --- modules/default/calendar/calendar.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 73af9ecd..87da4ae5 100755 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -277,8 +277,11 @@ Module.register("calendar", { if (typeof this.config.customEvents[ev].color !== "undefined" && this.config.customEvents[ev].color !== "") { needle = new RegExp(this.config.customEvents[ev].keyword, "gi"); if (needle.test(event.title)) { - eventWrapper.style.cssText = "color:" + this.config.customEvents[ev].color; - titleWrapper.style.cssText = "color:" + this.config.customEvents[ev].color; + // Respect parameter ColoredSymbolOnly also for custom events + if (!this.config.coloredSymbolOnly) { + eventWrapper.style.cssText = "color:" + this.config.customEvents[ev].color; + titleWrapper.style.cssText = "color:" + this.config.customEvents[ev].color; + } if (this.config.displaySymbol) { symbolWrapper.style.cssText = "color:" + this.config.customEvents[ev].color; } From 3dacce66752f3ed1d288ffb207b76377638a88b8 Mon Sep 17 00:00:00 2001 From: TheDuffman85 Date: Tue, 9 Feb 2021 13:05:11 +0100 Subject: [PATCH 2/3] Respect parameter ColoredSymbolOnly also for custom events --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb2fa656..7faa4f48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ _This release is scheduled to be released on 2021-04-01._ - Added `start:dev` command to the npm scripts for starting electron with devTools open. - Added logging when using deprecated modules weatherforecast or currentweather. - Portuguese translations for "MODULE_CONFIG_CHANGED" and PRECIP. +- Respect parameter ColoredSymbolOnly also for custom events ### Updated From 5ffd20b8430683323df94d52b98e87605695cc88 Mon Sep 17 00:00:00 2001 From: TheDuffman85 Date: Tue, 9 Feb 2021 15:21:14 +0100 Subject: [PATCH 3/3] Removed unnecessary tabs --- modules/default/calendar/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 87da4ae5..d5f5250b 100755 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -281,7 +281,7 @@ Module.register("calendar", { if (!this.config.coloredSymbolOnly) { eventWrapper.style.cssText = "color:" + this.config.customEvents[ev].color; titleWrapper.style.cssText = "color:" + this.config.customEvents[ev].color; - } + } if (this.config.displaySymbol) { symbolWrapper.style.cssText = "color:" + this.config.customEvents[ev].color; }