From b44dcc9f30d9e3c5a3d15075fe40073b4188aab5 Mon Sep 17 00:00:00 2001 From: GzoT Date: Fri, 24 Jun 2016 09:15:12 +0000 Subject: [PATCH] Not display title and/or message if they are not provided (alert module) --- modules/default/alert/alert.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js index 084161ac..3099471d 100644 --- a/modules/default/alert/alert.js +++ b/modules/default/alert/alert.js @@ -35,9 +35,17 @@ Module.register("alert",{ }, show_notification: function(message) { if (this.config.effect == "slide") {this.config.effect = this.config.effect + "-" + this.config.position;} - message = "" + message.title + "
" + message.message + ""; + + msg = ""; + if (message.title) { + msg += "" + message.title + ""; + } + if (message.message){ + msg += "
" + message.message + ""; + } + new NotificationFx({ - message: message, + message: msg, layout: "growl", effect: this.config.effect, ttl: this.config.display_time @@ -67,7 +75,15 @@ Module.register("alert",{ this.hide_alert(sender); } - message = "" + params.title + "
" + params.message + ""; + //Display title and message only if they are provided in notification parameters + message =""; + if (params.title) { + message += "" + params.title + "" + } + if (params.message) { + message += "
" + params.message + ""; + } + //Store alert in this.alerts this.alerts[sender.name] = new NotificationFx({ message: image + message,