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

Fix calendar clipping before broadcast (#3679)

Browse Source 
-fixes #3678
This commit is contained in:
sam detweiler 2025-01-03 12:10:29 -06:00 committed by GitHub
parent 6f50a7b3bd
commit 75dbe67167
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -23,6 +23,8 @@ planned for 2025-04-01
### Fixed ### Fixed
- [calendar] fix clipping events being broadcast (#3678)
## [2.30.0] - 2025-01-01 ## [2.30.0] - 2025-01-01
Thanks to: @xsorifc28, @HeikoGr, @bugsounet, @khassel, @KristjanESPERANTO, @rejas, @sdetweil. Thanks to: @xsorifc28, @HeikoGr, @bugsounet, @khassel, @KristjanESPERANTO, @rejas, @sdetweil.

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

@ -692,9 +692,13 @@ Module.register("calendar", {
by_url_calevents.sort(function (a, b) { by_url_calevents.sort(function (a, b) {
return a.startDate - b.startDate; return a.startDate - b.startDate;
}); });
if (limitNumberOfEntries) {
Log.debug(`pushing ${by_url_calevents.length} events to total with room for ${remainingEntries}`); Log.debug(`pushing ${by_url_calevents.length} events to total with room for ${remainingEntries}`);
events = events.concat(by_url_calevents.slice(0, remainingEntries)); events = events.concat(by_url_calevents.slice(0, remainingEntries));
Log.debug(`events for calendar=${events.length}`); Log.debug(`events for calendar=${events.length}`);
} else {
events = events.concat(by_url_calevents);
}
} }
Log.info(`sorting events count=${events.length}`); Log.info(`sorting events count=${events.length}`);
events.sort(function (a, b) { events.sort(function (a, b) {