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

Merge pull request #2360 from rejas/issue_2228

Browse Source 
Hide alert overlay when dismissed manually
This commit is contained in:
Michael Teeuw 2020-12-21 11:20:55 +01:00 committed by GitHub
commit 9858d5b495
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -45,6 +45,7 @@ _This release is scheduled to be released on 2021-01-01._
- Fix non-fullday recurring rule processing (#2216) - Fix non-fullday recurring rule processing (#2216)
- Catch errors when parsing calendar data with ical (#2022) - Catch errors when parsing calendar data with ical (#2022)
- Corrected logic for timeFormat "relative" and "absolute" - Corrected logic for timeFormat "relative" and "absolute"
- Fix Default Alert Module does not hide black overlay when alert is dismissed manually (#2228)
## [2.13.0] - 2020-10-01 ## [2.13.0] - 2020-10-01

3
modules/default/alert/alert.js
View File

@ -100,10 +100,13 @@ Module.register("alert", {
message: image + message, message: image + message,
effect: this.config.alert_effect, effect: this.config.alert_effect,
ttl: params.timer, ttl: params.timer,
onClose: () => this.hide_alert(sender),
al_no: "ns-alert" al_no: "ns-alert"
}); });
//Show alert //Show alert
this.alerts[sender.name].show(); this.alerts[sender.name].show();
//Add timer to dismiss alert and overlay //Add timer to dismiss alert and overlay
if (params.timer) { if (params.timer) {
setTimeout(() => { setTimeout(() => {