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

Merge calendar symbols

Browse Source
This commit is contained in:
rejas 2020-07-14 21:05:44 +02:00
parent 3b5a0e8d66
commit 7489d19784
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,10 +220,6 @@ Module.register("calendar", {
symbolWrapper.className = "symbol align-right " + symbolClass; symbolWrapper.className = "symbol align-right " + symbolClass;
var symbols = this.symbolsForEvent(event); var symbols = this.symbolsForEvent(event);
if (typeof symbols === "string") {
symbols = [symbols];
}
for (var i = 0; i < symbols.length; i++) { for (var i = 0; i < symbols.length; i++) {
var symbol = document.createElement("span"); var symbol = document.createElement("span");
symbol.className = "fa fa-fw fa-" + symbols[i]; symbol.className = "fa fa-fw fa-" + symbols[i];
@ -232,6 +228,7 @@ Module.register("calendar", {
} }
symbolWrapper.appendChild(symbol); symbolWrapper.appendChild(symbol);
} }
eventWrapper.appendChild(symbolWrapper); eventWrapper.appendChild(symbolWrapper);
} else if (this.config.timeFormat === "dateheaders") { } else if (this.config.timeFormat === "dateheaders") {
var blankCell = document.createElement("td"); var blankCell = document.createElement("td");
@ -566,16 +563,28 @@ Module.register("calendar", {
* *
* argument event object - Event to look for. * argument event object - Event to look for.
* *
* return string/array - The Symbols * return array - The Symbols
*/ */
symbolsForEvent: function (event) { symbolsForEvent: function (event) {
let symbols = this.getCalendarPropertyAsArray(event.url, "symbol", this.config.defaultSymbol);
if (event.recurringEvent === true) { if (event.recurringEvent === true) {
return this.getCalendarProperty(event.url, "recurringSymbol", this.config.recurringSymbol); symbols = this.mergeUnique(symbols, this.getCalendarPropertyAsArray(event.url, "recurringSymbol", this.config.recurringSymbol));
} }
if (event.fullDayEvent === true) { if (event.fullDayEvent === true) {
return this.getCalendarProperty(event.url, "fullDaySymbol", this.config.recurringSymbol); symbols = this.mergeUnique(symbols, this.getCalendarPropertyAsArray(event.url, "fullDaySymbol", this.config.recurringSymbol));
} }
return this.getCalendarProperty(event.url, "symbol", this.config.defaultSymbol);
return symbols;
},
mergeUnique: function (arr1, arr2) {
return arr1.concat(
arr2.filter(function (item) {
return arr1.indexOf(item) === -1;
})
);
}, },
/** /**
@ -667,6 +676,12 @@ Module.register("calendar", {
return defaultValue; return defaultValue;
}, },
getCalendarPropertyAsArray: function (url, property, defaultValue) {
let p = this.getCalendarProperty(url, property, defaultValue);
if (!(p instanceof Array)) p = [p];
return p;
},
/** /**
* Shortens a string if it's longer than maxLength and add a ellipsis to the end * Shortens a string if it's longer than maxLength and add a ellipsis to the end
* *