kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2871 from sdetweil/fix_maxEntries

Browse Source 
Fix maximumEntries regression
This commit is contained in:
Michael Teeuw 2022-06-28 15:26:31 +02:00 committed by GitHub
commit e25209d9f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -61,6 +61,7 @@ Special thanks to the following contributors: @10bias, @CFenner, @JHWelch, @k1rd
- Don't adjust startDate for full day events if endDate is in the past. - Don't adjust startDate for full day events if endDate is in the past.
- Fix windspeed conversion error in openweathermap provider. (#2812) - Fix windspeed conversion error in openweathermap provider. (#2812)
- Fix conflicting parms turning off showEnd for full day events. (#2629) - Fix conflicting parms turning off showEnd for full day events. (#2629)
- Fix regression, calendar.maximumEntries not used to filter calendar level entries (#2868)
## [2.18.0] - 2022-01-01 ## [2.18.0] - 2022-01-01

3
modules/default/calendar/calendarutils.js
View File

@ -498,7 +498,8 @@ const CalendarUtils = {
return a.startDate - b.startDate; return a.startDate - b.startDate;
}); });
return newEvents; let maxEvents = newEvents.slice(0, config.maximumEntries);
return maxEvents;
}, },
/** /**