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

Don't open other pads' chat in the current pad's messenger

Browse Source
This commit is contained in:
yflory 2018-09-10 17:43:19 +02:00
parent 826b217c55
commit 382690e5c8
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/sframe-common.js
View File

@ -162,6 +162,10 @@ define([
}; };
// Chat // Chat
var padChatChannel;
funcs.getPadChat = function () {
return padChatChannel;
};
funcs.openPadChat = function (saveChanges) { funcs.openPadChat = function (saveChanges) {
var md = JSON.parse(JSON.stringify(ctx.metadataMgr.getMetadata())); var md = JSON.parse(JSON.stringify(ctx.metadataMgr.getMetadata()));
var channel = md.chat || Hash.createChannelId(); var channel = md.chat || Hash.createChannelId();
@ -170,6 +174,7 @@ define([
ctx.metadataMgr.updateMetadata(md); ctx.metadataMgr.updateMetadata(md);
setTimeout(saveChanges); setTimeout(saveChanges);
} }
padChatChannel = channel;
ctx.sframeChan.query('Q_CHAT_OPENPADCHAT', channel, function (err, obj) { ctx.sframeChan.query('Q_CHAT_OPENPADCHAT', channel, function (err, obj) {
if (err || (obj && obj.error)) { console.error(err || (obj && obj.error)); } if (err || (obj && obj.error)) { console.error(err || (obj && obj.error)); }
}); });

2
www/contacts/messenger-ui.js
View File

@ -708,6 +708,8 @@ define([
}; };
var onPadChatReady = function (data) { var onPadChatReady = function (data) {
var padChat = common.getPadChat();
if (data !== padChat) { return; }
execCommand('GET_ROOMS', {padChat: data}, function (err, rooms) { execCommand('GET_ROOMS', {padChat: data}, function (err, rooms) {
if (err) { return void console.error(err); } if (err) { return void console.error(err); }
if (!Array.isArray(rooms) || rooms.length !== 1) { if (!Array.isArray(rooms) || rooms.length !== 1) {