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

Make metadata-manager a bit more robust

Browse Source
This commit is contained in:
Caleb James DeLisle 2017-09-27 11:56:25 +02:00
parent 342b6012f7
commit 90d00c10b1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,9 +51,9 @@ define(['json.sortify'], function (Sortify) {
mdo[meta.user.netfluxId] = meta.user; mdo[meta.user.netfluxId] = meta.user;
} }
metadataObj.users = mdo; metadataObj.users = mdo;
var lazyUserStr = JSON.stringify(metadataLazyObj.users[meta.user.netfluxId]); var lazyUserStr = Sortify(metadataLazyObj.users[meta.user.netfluxId]);
dirty = false; dirty = false;
if (lazy || lazyUserStr !== JSON.stringify(meta.user)) { if (lazy || lazyUserStr !== Sortify(meta.user)) {
metadataLazyObj = JSON.parse(JSON.stringify(metadataObj)); metadataLazyObj = JSON.parse(JSON.stringify(metadataObj));
lazyChangeHandlers.forEach(function (f) { f(); }); lazyChangeHandlers.forEach(function (f) { f(); });
} }
@ -105,6 +105,7 @@ define(['json.sortify'], function (Sortify) {
updateMetadata: function (m) { updateMetadata: function (m) {
// JSON.parse(JSON.stringify()) reorders the json, so we have to use sortify even // JSON.parse(JSON.stringify()) reorders the json, so we have to use sortify even
// if it's on our own computer // if it's on our own computer
if (!m) { return; }
if (Sortify(metadataLazyObj) === Sortify(m)) { return; } if (Sortify(metadataLazyObj) === Sortify(m)) { return; }
metadataObj = JSON.parse(JSON.stringify(m)); metadataObj = JSON.parse(JSON.stringify(m));
metadataLazyObj = JSON.parse(JSON.stringify(m)); metadataLazyObj = JSON.parse(JSON.stringify(m));