Don't open other pads' chat in the current pad's messenger
This commit is contained in:
parent
826b217c55
commit
382690e5c8
2 changed files with 7 additions and 0 deletions
|
@ -162,6 +162,10 @@ define([
|
|||
};
|
||||
|
||||
// Chat
|
||||
var padChatChannel;
|
||||
funcs.getPadChat = function () {
|
||||
return padChatChannel;
|
||||
};
|
||||
funcs.openPadChat = function (saveChanges) {
|
||||
var md = JSON.parse(JSON.stringify(ctx.metadataMgr.getMetadata()));
|
||||
var channel = md.chat || Hash.createChannelId();
|
||||
|
@ -170,6 +174,7 @@ define([
|
|||
ctx.metadataMgr.updateMetadata(md);
|
||||
setTimeout(saveChanges);
|
||||
}
|
||||
padChatChannel = channel;
|
||||
ctx.sframeChan.query('Q_CHAT_OPENPADCHAT', channel, function (err, obj) {
|
||||
if (err || (obj && obj.error)) { console.error(err || (obj && obj.error)); }
|
||||
});
|
||||
|
|
|
@ -708,6 +708,8 @@ define([
|
|||
};
|
||||
|
||||
var onPadChatReady = function (data) {
|
||||
var padChat = common.getPadChat();
|
||||
if (data !== padChat) { return; }
|
||||
execCommand('GET_ROOMS', {padChat: data}, function (err, rooms) {
|
||||
if (err) { return void console.error(err); }
|
||||
if (!Array.isArray(rooms) || rooms.length !== 1) {
|
||||
|
|
Loading…
Reference in a new issue