kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

Fix tests, use non-spread object extend version again

Browse Source
This commit is contained in:
Veeck
2020-04-20 11:24:03 +02:00
parent fb557b9130
commit 7a976c0239
3 changed files with 190 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/default/alert/notificationFx.js
View File

@@ -12,11 +12,24 @@
*/
;(function(window) {
/**
* extend obj function
*/
function extend(a, b) {
for (let key in b) {
if (b.hasOwnProperty(key)) {
a[key] = b[key];
}
}
return a;
}
/**
* NotificationFx function
*/
function NotificationFx(options) {
this.options = { ...this.options, ...options };
this.options = extend({}, this.options);
extend(this.options, options);
this._init();
}
@@ -56,7 +69,7 @@
NotificationFx.prototype._init = function() {
// create HTML structure
this.ntf = document.createElement("div");
this.ntf.className = this.options.al_no + " ns-" + this.options.layout + " ns-effect-" + this.options.effect + " ns-type-" + this.options.type;
this.ntf.className = this.options.al_no + " ns-" + this.options.layout + " ns-effect-" + this.options.effect + " ns-type-" + this.options.type;
let strinner = "<div class=\"ns-box-inner\">";
strinner += this.options.message;
strinner += "</div>";
@@ -112,7 +125,7 @@
// after animation ends remove ntf from the DOM
const onEndAnimationFn = (ev) => {
if (ev.target !== this.ntf) return false;
if (ev.target !== this.ntf) {return false;}
this.ntf.removeEventListener("animationend", onEndAnimationFn);
if (ev.target.parentNode === this.options.wrapper) {