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

Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-08-17 15:42:28 +02:00
parent ad9f2ff223 226ef1fd00
commit a4850a7fcc
4 changed files with 1085 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,18 +20,21 @@ define([], function () {
}
var mdo = {};
// We don't want to add our user data to the object multiple times.
var containsYou = false;
//var containsYou = false;
//console.log(metadataObj);
console.log(metadataObj.users);
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) {
/*if (metadataObj.users[x].uid === meta.user.uid) {
//console.log('document already contains you');
containsYou = true;
}
}*/
});
if (!containsYou) { mdo[meta.user.netfluxId] = meta.user; }
//if (!containsYou) { mdo[meta.user.netfluxId] = meta.user; }
mdo[meta.user.netfluxId] = meta.user;
metadataObj.users = mdo;
dirty = false;
changeHandlers.forEach(function (f) { f(); });
};
@@ -74,8 +77,15 @@ define([], function () {
checkUpdate();
return Object.freeze(JSON.parse(JSON.stringify(metadataObj)));
},
onChange: function (f) { changeHandlers.push(f); }
onChange: function (f) { changeHandlers.push(f); },
getNetfluxId: function () {
return meta && meta.user && meta.user.netfluxId;
},
getUserlist: function () {
var list = members.slice().filter(function (m) { return m.length === 32; });
return list;
}
});
};
return Object.freeze({ create: create });
});
});