@sdetweil for calendar I got this return and the cursor did not return to cd ~/MagicMirror/ I just have two points at the bottom of the file
pi@MagicMirror:~/MagicMirror $ git diff modules/default/calendar/calendar.js
diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/cal endar.js
index 2ef9ca9c..4f70a1e9 100644
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -1,6 +1,6 @@
/* global cloneObject */
-/* MagicMirror²
+/* Magic Mirror
* Module: Calendar
*
* By Michael Teeuw https://michaelteeuw.nl
@@ -11,11 +11,8 @@ Module.register("calendar", {
defaults: {
maximumEntries: 10, // Total Maximum Entries
maximumNumberOfDays: 365,
- limitDays: 0, // Limit the number of days shown, 0 = no limit
- pastDaysCount: 0,
displaySymbol: true,
- defaultSymbol: "calendar-alt", // Fontawesome Symbol see https:/ /fontawesome.com/cheatsheet?from=io
- defaultSymbolClassName: "fas fa-fw fa-",
:...skipping...
diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js
index 2ef9ca9c..4f70a1e9 100644
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -1,6 +1,6 @@
/* global cloneObject */
-/* MagicMirror²
+/* Magic Mirror
* Module: Calendar
*
* By Michael Teeuw https://michaelteeuw.nl
@@ -11,11 +11,8 @@ Module.register("calendar", {
defaults: {
maximumEntries: 10, // Total Maximum Entries
maximumNumberOfDays: 365,
- limitDays: 0, // Limit the number of days shown, 0 = no limit
- pastDaysCount: 0,
displaySymbol: true,
- defaultSymbol: "calendar-alt", // Fontawesome Symbol see https://fontawesome.com/cheatsheet?from=io
- defaultSymbolClassName: "fas fa-fw fa-",
+ defaultSymbol: "calendar", // Fontawesome Symbol see https://fontawesome.com/cheatsheet?from=io
showLocation: false,
displayRepeatingCountTitle: false,
defaultRepeatingCountTitle: "",
@@ -27,25 +24,23 @@ Module.register("calendar", {
maxEventTitleLines: 3,
fetchInterval: 5 * 60 * 1000, // Update every 5 minutes.
animationSpeed: 2000,
- fade: true,
+ fade: false,
urgency: 7,
- timeFormat: "relative",
- dateFormat: "MMM Do",
+ timeFormat: "absolute",
+ dateFormat: "Do MMM HH:mm",
dateEndFormat: "LT",
- fullDayEventDateFormat: "MMM Do",
+ fullDayEventDateFormat: "Do MMM",
showEnd: false,
getRelative: 6,
fadePoint: 0.25, // Start on 1/4th of the list.
hidePrivate: false,
hideOngoing: false,
- hideTime: false,
- showTimeToday: false,
colored: false,
- customEvents: [], // Array of {keyword: "", symbol: "", color: ""} where Keyword is a regexp and symbol/color are to be applied for matched
+ coloredSymbolOnly: false,
tableClass: "small",
calendars: [
{
- symbol: "calendar-alt",
+ symbol: "calendar",
url: "https://www.calendarlabs.com/templates/ical/US-Holidays.ics"
}
],
@@ -60,18 +55,9 @@ Module.register("calendar", {
excludedEvents: [],
sliceMultiDayEvents: false,
broadcastPastEvents: false,
- nextDaysRelative: false,
:
