Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed revision issue for old revisions

pull/5107/head
Laurent Cozic 2021-06-20 13:59:58 +01:00
parent d13b1f96ba
commit 9323caf2f1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/lib/models/Revision.ts
View File

@ -45,7 +45,10 @@ export default class Revision extends BaseItem {
if (this.isLegacyPatch(patch)) { if (this.isLegacyPatch(patch)) {
return this.applyTextPatchLegacy(text, patch); return this.applyTextPatchLegacy(text, patch);
} else { } else {
const result = dmp.patch_apply(JSON.parse(patch), text); // An empty patch should be '[]', but legacy data may be just "".
// However an empty string would make JSON.parse fail so we set it
// to '[]'.
const result = dmp.patch_apply(JSON.parse(patch ? patch : '[]'), text);
if (!result || !result.length) throw new Error('Could not apply patch'); if (!result || !result.length) throw new Error('Could not apply patch');
return result[0]; return result[0];
} }