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

This should fix laxy metadata

Browse Source
This commit is contained in:
Caleb James DeLisle 2017-08-17 18:26:58 +02:00
parent 2490ee253f
commit 909bda4302
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,13 @@ define([], function () {
var meta = UNINIT; var meta = UNINIT;
var members = []; var members = [];
var metadataObj = UNINIT; var metadataObj = UNINIT;
// This object reflects the metadata which is in the document at this moment.
// Normally when a person leaves the pad, everybody sees them leave and updates
// their metadata, this causes everyone to fight to change the document and
// operational transform doesn't like it. So this is a lazy object which is
// only updated either:
// 1. On changes to the metadata that come in from someone else
// 2. On changes connects, disconnects or changes to your own metadata
var metadataLazyObj = UNINIT; var metadataLazyObj = UNINIT;
var priv = {}; var priv = {};
var dirty = true; var dirty = true;
@ -37,7 +44,8 @@ define([], function () {
//if (!containsYou) { mdo[meta.user.netfluxId] = meta.user; } //if (!containsYou) { mdo[meta.user.netfluxId] = meta.user; }
mdo[meta.user.netfluxId] = meta.user; mdo[meta.user.netfluxId] = meta.user;
metadataObj.users = mdo; metadataObj.users = mdo;
if (lazy) { var lazyUserStr = JSON.stringify(metadataLazyObj.users[meta.user.netfluxId]);
if (lazy || lazyUserStr !== JSON.stringify(meta.user)) {
metadataLazyObj.users = mdo; metadataLazyObj.users = mdo;
} }
@ -81,8 +89,9 @@ define([], function () {
return Object.freeze({ return Object.freeze({
updateMetadata: function (m) { updateMetadata: function (m) {
if (JSON.stringify(metadataObj) === JSON.stringify(m)) { return; } if (JSON.stringify(metadataObj) === JSON.stringify(m)) { return; }
metadataObj = m; metadataObj = JSON.parse(JSON.stringify(m));
change(true); metadataLazyObj = JSON.parse(JSON.stringify(m));
change(false);
}, },
getMetadata: function () { getMetadata: function () {
checkUpdate(false); checkUpdate(false);