Merge pull request #2532 from ezeholz/develop

Alert Module not recognizing multiple alerts

CHANGELOG.md

@@ -30,6 +30,7 @@ _This release is scheduled to be released on 2021-04-01._
 - Fix tests in weather module and add one for decimalPoint in forecast
 - Fix decimalSymbol in the forcast part of the new weather module #2530
 - Fix wrong treatment of `appendLocationNameToHeader` when using `ukmetofficedatahub`
+- Fix alert not recognizing multiple alerts (#2522)
 
 ## [2.15.0] - 2021-04-01
 

modules/default/alert/alert.js

@@ -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");

modules/default/alert/notificationFx.js

@@ -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