infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'cpnetflux' into staging

pull/1/head
yflory 2019-05-16 16:11:32 +02:00
parent c8b9830298 909e70905c
commit 2168557124
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/outer/async-store.js
View File

@ -1063,6 +1063,8 @@ define([
},
onConnectionChange: function () {},
crypto: {
// The encryption and decryption is done in the outer window.
// This async-store only deals with already encrypted messages.
encrypt: function (m) { return m; },
decrypt: function (m) { return m; }
},
@ -1092,6 +1094,7 @@ define([
channel.queue.forEach(function (data) {
channel.sendMessage(data.message, clientId);
});
channel.queue = [];
channel.bcast("PAD_CONNECT", {
myID: wc.myID,
id: wc.id,