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

fixed one last fight

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-08-10 21:40:34 +02:00
parent 9c0b0cc6a8
commit 33e73dd5e5
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
www/common/metadata-manager.js
View File

@@ -2,7 +2,6 @@ define([], function () {
var UNINIT = 'uninitialized';
var create = function (sframeChan) {
var meta = UNINIT;
var myID = UNINIT;
var members = [];
var metadataObj = UNINIT;
var dirty = true;
@@ -11,27 +10,27 @@ define([], function () {
var checkUpdate = function () {
if (!dirty) { return; }
if (meta === UNINIT) { throw new Error(); }
if (myID === UNINIT) { myID = meta.myID; }
if (metadataObj === UNINIT) {
metadataObj = {
defaultTitle: meta.doc.defaultTitle,
title: meta.doc.defaultTitle,
type: meta.doc.type,
users: {}
};
}
var mdo = {};
// We don't want to add our user data to the object multiple times.
var containsYou = false;
console.log(metadataObj);
//console.log(metadataObj);
Object.keys(metadataObj.users).forEach(function (x) {
if (members.indexOf(x) === -1) { return; }
mdo[x] = metadataObj.users[x];
if (metadataObj.users[x].uid === meta.user.uid) {
console.log('document already contains you');
//console.log('document already contains you');
containsYou = true;
}
});
if (!containsYou) { mdo[myID] = meta.user; }
if (!containsYou) { mdo[meta.user.netfluxId] = meta.user; }
metadataObj.users = mdo;
dirty = false;
changeHandlers.forEach(function (f) { f(); });
@@ -46,7 +45,7 @@ define([], function () {
change();
});
sframeChan.on('EV_RT_CONNECT', function (ev) {
myID = ev.myID;
meta.user.netfluxId = ev.myID;
members = ev.members;
change();
});