From 216c94b1f095a34b0222dfb7f271347e5cbc344e Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 10 Sep 2018 17:50:36 +0200 Subject: [PATCH] Fix messenger notifications --- www/common/common-messenger.js | 1 - www/contacts/messenger-ui.js | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/www/common/common-messenger.js b/www/common/common-messenger.js index 354097393..0872b0585 100644 --- a/www/common/common-messenger.js +++ b/www/common/common-messenger.js @@ -735,7 +735,6 @@ define([ // Handled by .on('remove') return; } - console.error(o, n, p); }).on('remove', ['friends'], function (o, p) { var curvePublic = p[1]; if (!curvePublic) { return; } diff --git a/www/contacts/messenger-ui.js b/www/contacts/messenger-ui.js index 339ebae51..9882ea157 100644 --- a/www/contacts/messenger-ui.js +++ b/www/contacts/messenger-ui.js @@ -3,11 +3,10 @@ define([ '/customize/messages.js', '/common/common-util.js', '/common/common-interface.js', - '/common/common-notifier.js', '/common/hyperscript.js', '/bower_components/marked/marked.min.js', '/common/media-tag.js', -], function ($, Messages, Util, UI, Notifier, h, Marked, MediaTag) { +], function ($, Messages, Util, UI, h, Marked, MediaTag) { 'use strict'; var debug = console.log; @@ -493,9 +492,8 @@ define([ return ($elem[0].scrollHeight - $elem.scrollTop() === $elem.outerHeight()); }; - var initializing = true; messenger.on('message', function (message) { - if (!initializing) { Notifier.notify(); } + common.notify(); var chanId = message.channel; var chat = getChat(chanId);