Fix alerts

Fixes #2522
This commit is contained in:
Ezequiel Holzweissig 2021-04-10 20:15:32 -03:00
parent 7ea5b1ecbf
commit 82727b825c
3 changed files with 6 additions and 5 deletions

View File

@ -25,6 +25,7 @@ _This release is scheduled to be released on 2021-04-01._
- Fix calendar start function logging inconsistency.
- Fix updatenotification start function logging inconsistency.
- Checks and applies the showDescription setting for the newsfeed module again
- Fix alert not recognizing multiple alerts (#2522)
## [2.15.0] - 2021-04-01

View File

@ -79,7 +79,7 @@ Module.register("alert", {
//If module already has an open alert close it
if (this.alerts[sender.name]) {
this.hide_alert(sender);
this.hide_alert(sender,false);
}
//Display title and message only if they are provided in notification parameters
@ -114,10 +114,10 @@ Module.register("alert", {
}, params.timer);
}
},
hide_alert: function (sender) {
hide_alert: function (sender,close=true) {
//Dismiss alert and remove from this.alerts
if (this.alerts[sender.name]) {
this.alerts[sender.name].dismiss();
this.alerts[sender.name].dismiss(close);
this.alerts[sender.name] = null;
//Remove overlay
const overlay = document.getElementById("overlay");

View File

@ -123,7 +123,7 @@
/**
* Dismiss the notification
*/
NotificationFx.prototype.dismiss = function () {
NotificationFx.prototype.dismiss = function (close=true) {
this.active = false;
clearTimeout(this.dismissttl);
this.ntf.classList.remove("ns-show");
@ -131,7 +131,7 @@
this.ntf.classList.add("ns-hide");
// callback
this.options.onClose();
if(close) this.options.onClose();
}, 25);
// after animation ends remove ntf from the DOM