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

Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed

Browse Source
This commit is contained in:
Caleb James DeLisle 2017-10-12 15:42:09 +03:00
parent c8928a0811
commit c773b5d076
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
www/common/sframe-app-framework.js
View File

@ -236,21 +236,6 @@ define([
cpNfInner.metadataMgr.updateMetadata(extractMetadata(newContent)); cpNfInner.metadataMgr.updateMetadata(extractMetadata(newContent));
newContent = normalize(newContent); newContent = normalize(newContent);
contentUpdate(newContent); contentUpdate(newContent);
if (!readOnly) {
var newContent2NoMeta = normalize(contentGetter());
var newContent2StrNoMeta = JSONSortify(newContent2NoMeta);
var newContentStrNoMeta = JSONSortify(newContent);
if (newContent2StrNoMeta !== newContentStrNoMeta) {
console.log('err');
console.error("shjson2 !== shjson");
console.log(newContent2StrNoMeta);
console.log(newContentStrNoMeta);
Cryptpad.errorLoadingScreen(Messages.wrongApp);
throw new Error();
}
}
} else { } else {
title.updateTitle(Cryptpad.initialName || title.defaultTitle); title.updateTitle(Cryptpad.initialName || title.defaultTitle);
evOnDefaultContentNeeded.fire(); evOnDefaultContentNeeded.fire();
@ -346,7 +331,8 @@ define([
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
cpNfInner = common.startRealtime({ cpNfInner = common.startRealtime({
// really basic operational transform // really basic operational transform
transformFunction: options.transformFunction || JsonOT.transform, //transformFunction: options.transformFunction || JsonOT.validate,
patchTransformer: options.patchTransformer || JsonOT.patchTransformer,
// cryptpad debug logging (default is 1) // cryptpad debug logging (default is 1)
// logLevel: 0, // logLevel: 0,
validateContent: options.validateContent || function (content) { validateContent: options.validateContent || function (content) {
@ -355,6 +341,8 @@ define([
return true; return true;
} catch (e) { } catch (e) {
console.log("Failed to parse, rejecting patch"); console.log("Failed to parse, rejecting patch");
console.log(e.stack);
console.log(content);
return false; return false;
} }
}, },

1
www/pad/inner.js
View File

@ -410,6 +410,7 @@ define([
framework.setContentGetter(function () { framework.setContentGetter(function () {
displayMediaTags(framework, inner, mediaTagMap); displayMediaTags(framework, inner, mediaTagMap);
inner.normalize();
return Hyperjson.fromDOM(inner, isNotMagicLine, hjsonFilters); return Hyperjson.fromDOM(inner, isNotMagicLine, hjsonFilters);
}); });