From 61568aca3283747dcaf3862dc4bf932a8a20a7e9 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Wed, 15 Feb 2017 19:12:45 +0000 Subject: [PATCH] The notification option wasn't being used consistently --- docs/CHANGES.md | 3 ++- src/converse-notification.js | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/CHANGES.md b/docs/CHANGES.md index 07e9d80eb..a02ebf85b 100755 --- a/docs/CHANGES.md +++ b/docs/CHANGES.md @@ -20,9 +20,10 @@ - Allow JIDs not on the roster to be invited to a chatroom. [jcbrand] - #770 Allow setting contact attrs on chats.open [Ape] -## 2.0.7 (2017-02-14) +## 2.0.7 (2017-02-15) - Bugfix. 'TypeError: this.sendConfiguration(...).then is not a function' when an instant room is created. [jcbrand] - Ensure consistent behavior from `show_controlbox_by_default` [jcbrand] +- #694 The `notification_option` wasn't being used consistently. [jcbrand] ## 2.0.6 (2017-02-13) - Escape user-generated input to prevent JS-injection attacks. (Thanks to SamWhited) [jcbrand] diff --git a/src/converse-notification.js b/src/converse-notification.js index 6d4a8950e..53067babd 100644 --- a/src/converse-notification.js +++ b/src/converse-notification.js @@ -182,7 +182,7 @@ var n = new Notification(contact.fullname, { body: message, lang: _converse.i18n.locale_data.converse[""].lang, - icon: 'logo/conversejs.png' + icon: _converse.notification_icon }); setTimeout(n.close.bind(n), 5000); }; @@ -191,7 +191,7 @@ var n = new Notification(contact.fullname, { body: __('wants to be your contact'), lang: _converse.i18n.locale_data.converse[""].lang, - icon: 'logo/conversejs.png' + icon: _converse.notification_icon }); setTimeout(n.close.bind(n), 5000); }; @@ -201,7 +201,7 @@ var n = new Notification(data.subject, { body: data.message, lang: _converse.i18n.locale_data.converse[""].lang, - icon: 'logo/conversejs.png' + icon: _converse.notification_icon }); setTimeout(n.close.bind(n), 5000); }