From 497145b1b59704aefd64045e7f9146186ee072a3 Mon Sep 17 00:00:00 2001 From: "E:V:A" Date: Mon, 2 Apr 2018 14:07:25 +0300 Subject: [PATCH 1/3] null check for notification removal Make sure there is something to remove, before we attempt to remove the notifications. - This fixes #1240 --- modules/default/alert/alert.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js index c5d3e650..7845b5d0 100644 --- a/modules/default/alert/alert.js +++ b/modules/default/alert/alert.js @@ -109,12 +109,14 @@ Module.register("alert",{ }, hide_alert: function(sender) { - //Dismiss alert and remove from this.alerts - this.alerts[sender.name].dismiss(); - this.alerts[sender.name] = null; - //Remove overlay - var overlay = document.getElementById("overlay"); - overlay.parentNode.removeChild(overlay); + //Dismiss alert and remove from this.alerts + if (this.alerts[sender.name]) { + this.alerts[sender.name].dismiss(); + this.alerts[sender.name] = null; + //Remove overlay + var overlay = document.getElementById("overlay"); + overlay.parentNode.removeChild(overlay); + } }, setPosition: function(pos) { //Add css to body depending on the set position for notifications From 3b4ff1818e74fa35b46337240e055181456d79dc Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Mon, 2 Apr 2018 14:03:16 +0200 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad4b6698..d450db5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Fixed issue where wind chill could not be displayed in Fahrenheit. [#1247](https://github.com/MichMich/MagicMirror/issues/1247) +- Fix issues where a module crashes when it tries to dismiss a non exsisting alert. [#1240](https://github.com/MichMich/MagicMirror/issues/1240) ### Updated - Updated italian translation From f1dee488a7432fcde81be21c73b53cd917603423 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Mon, 2 Apr 2018 14:11:21 +0200 Subject: [PATCH 3/3] Fix indent. --- modules/default/alert/alert.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js index 7845b5d0..85d6ef42 100644 --- a/modules/default/alert/alert.js +++ b/modules/default/alert/alert.js @@ -109,14 +109,14 @@ Module.register("alert",{ }, hide_alert: function(sender) { - //Dismiss alert and remove from this.alerts - if (this.alerts[sender.name]) { - this.alerts[sender.name].dismiss(); - this.alerts[sender.name] = null; - //Remove overlay - var overlay = document.getElementById("overlay"); - overlay.parentNode.removeChild(overlay); - } + //Dismiss alert and remove from this.alerts + if (this.alerts[sender.name]) { + this.alerts[sender.name].dismiss(); + this.alerts[sender.name] = null; + //Remove overlay + var overlay = document.getElementById("overlay"); + overlay.parentNode.removeChild(overlay); + } }, setPosition: function(pos) { //Add css to body depending on the set position for notifications