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

Merge branch 'cpnetflux' into staging

Browse Source
This commit is contained in:
yflory 2019-05-16 16:11:32 +02:00
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 () {}, onConnectionChange: function () {},
crypto: { 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; }, encrypt: function (m) { return m; },
decrypt: function (m) { return m; } decrypt: function (m) { return m; }
}, },
@ -1092,6 +1094,7 @@ define([
channel.queue.forEach(function (data) { channel.queue.forEach(function (data) {
channel.sendMessage(data.message, clientId); channel.sendMessage(data.message, clientId);
}); });
channel.queue = [];
channel.bcast("PAD_CONNECT", { channel.bcast("PAD_CONNECT", {
myID: wc.myID, myID: wc.myID,
id: wc.id, id: wc.id,