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

Fix conflicting curvePublic

Browse Source
This commit is contained in:
yflory
2019-12-18 19:10:30 +01:00
parent 3cd93b1d52
commit e0782d753d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/outer/team.js
View File

@@ -143,8 +143,8 @@ define([
if (state.members) {
Object.keys(state.members).forEach(function (curve) {
var m = state.members[curve];
if (m.inviteChannel) { list.push(m.inviteChannel); }
if (m.previewChannel) { list.push(m.previewChannel); }
if (m.inviteChannel && m.pending) { list.push(m.inviteChannel); }
if (m.previewChannel && m.pending) { list.push(m.previewChannel); }
});
}
@@ -1485,6 +1485,7 @@ define([
var acceptLinkInvitation = function (ctx, data, cId, cb) {
var inviteContent;
var rosterState;
nThen(function (waitFor) {
// Get team keys and ephemeral keys
getInviteContent(ctx, data, cId, waitFor(function (obj) {