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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
ClemDee 2019-06-07 16:05:57 +02:00
commit b546dd4033
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -962,7 +962,7 @@ define([
cb({error:err}); cb({error:err});
}); });
channel.messages = []; channel.messages = [];
} };
network.on('disconnect', function () { network.on('disconnect', function () {
emit('DISCONNECT'); emit('DISCONNECT');

4
www/common/messenger-ui.js
View File

@ -617,8 +617,10 @@ define([
}; };
var onLeave = function (obj) { var onLeave = function (obj) {
var channel = obj.id; var channel = obj.id;
var chan = state.channels[channel];
var data = obj.info; var data = obj.info;
if (contactsData[data.curvePublic]) { // XXX Teams: if someone leaves a room, don't remove their data if they're also a friend
if (contactsData[data.curvePublic] && !(chan && chan.isFriendChat)) {
delete contactsData[data.curvePublic]; delete contactsData[data.curvePublic];
} }
updateStatus(channel); updateStatus(channel);

2
www/common/sframe-common-mailbox.js
View File

@ -52,7 +52,7 @@ define([
var dismissIcon = h('span.fa.fa-times'); var dismissIcon = h('span.fa.fa-times');
var dismiss = h('div.cp-notification-dismiss', { var dismiss = h('div.cp-notification-dismiss', {
title: Messages.notifications_dismiss title: Messages.notifications_dismiss
}, dismissIcon) }, dismissIcon);
dismiss.addEventListener('click', function (e) { dismiss.addEventListener('click', function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();