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 #1044 from cederstrom/honor-calendar-maximum-entries

Browse Source 
Slice the list of all calendar events to honor config.maximumEntries
This commit is contained in:
Michael Teeuw 2017-10-01 21:51:33 +02:00 committed by GitHub
commit 6e051d73c1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -13,6 +13,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Updated ### Updated
### Fixed
- Fixed issue with calendar module showing more than `maximumEntries` allows
## [2.1.3] - 2017-10-01 ## [2.1.3] - 2017-10-01
**Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install` **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`

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

@ -356,7 +356,7 @@ Module.register("calendar", {
return a.startDate - b.startDate; return a.startDate - b.startDate;
}); });
return events; return events.slice(0, this.config.maximumEntries);
}, },
/* createEventList(url) /* createEventList(url)