web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix messenger notifications

Browse Source
This commit is contained in:
yflory 2018-09-10 17:50:36 +02:00
parent 382690e5c8
commit 216c94b1f0
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/common-messenger.js
View File

@ -735,7 +735,6 @@ define([
// Handled by .on('remove') // Handled by .on('remove')
return; return;
} }
console.error(o, n, p);
}).on('remove', ['friends'], function (o, p) { }).on('remove', ['friends'], function (o, p) {
var curvePublic = p[1]; var curvePublic = p[1];
if (!curvePublic) { return; } if (!curvePublic) { return; }

6
www/contacts/messenger-ui.js
View File

@ -3,11 +3,10 @@ define([
'/customize/messages.js', '/customize/messages.js',
'/common/common-util.js', '/common/common-util.js',
'/common/common-interface.js', '/common/common-interface.js',
'/common/common-notifier.js',
'/common/hyperscript.js', '/common/hyperscript.js',
'/bower_components/marked/marked.min.js', '/bower_components/marked/marked.min.js',
'/common/media-tag.js', '/common/media-tag.js',
], function ($, Messages, Util, UI, Notifier, h, Marked, MediaTag) { ], function ($, Messages, Util, UI, h, Marked, MediaTag) {
'use strict'; 'use strict';
var debug = console.log; var debug = console.log;
@ -493,9 +492,8 @@ define([
return ($elem[0].scrollHeight - $elem.scrollTop() === $elem.outerHeight()); return ($elem[0].scrollHeight - $elem.scrollTop() === $elem.outerHeight());
}; };
var initializing = true;
messenger.on('message', function (message) { messenger.on('message', function (message) {
if (!initializing) { Notifier.notify(); } common.notify();
var chanId = message.channel; var chanId = message.channel;
var chat = getChat(chanId); var chat = getChat(chanId);