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

Fix issues and replace chat module

Browse Source
This commit is contained in:
yflory
2019-09-16 16:48:32 +02:00
parent c6a4f78097
commit 641b69446d
10 changed files with 50 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
www/common/sframe-common-outer.js
View File

@@ -1091,20 +1091,25 @@ define([
Notifier.getPermission();
sframeChan.on('Q_CHAT_OPENPADCHAT', function (data, cb) {
Cryptpad.messenger.execCommand({
cmd: 'OPEN_PAD_CHAT',
Cryptpad.universal.execCommand({
type: 'messenger',
data: {
channel: data,
secret: secret
cmd: 'OPEN_PAD_CHAT',
data: {
channel: data,
secret: secret
}
}
}, cb);
});
/* DEPRECATED
sframeChan.on('Q_CHAT_COMMAND', function (data, cb) {
Cryptpad.messenger.execCommand(data, cb);
});
Cryptpad.messenger.onEvent.reg(function (data) {
sframeChan.event('EV_CHAT_EVENT', data);
});
*/
}
// Chrome 68 on Mac contains a bug resulting in the page turning white after a few seconds