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

Merge branch 'code-authorcolors-PR' of https://github.com/stoppegp/cryptpad into stoppegp-code-authorcolors-PR

Browse Source
This commit is contained in:
yflory
2020-04-08 17:03:09 +02:00
parent e5bcaeedce 272c1007db
commit ee3adccafc
2 changed files with 118 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/sframe-common-codemirror.js
View File

@@ -419,12 +419,12 @@ define([
exp.contentUpdate = function (newContent) {
exp.contentUpdate = function (newContent, authormarksUpdate, authormarksLocal) {
var oldDoc = canonicalize(editor.getValue());
var remoteDoc = newContent.content;
// setValueAndCursor triggers onLocal, even if we don't make any change to the content
// and it may revert other changes (metadata)
if (oldDoc === remoteDoc) { return; }
if (oldDoc === remoteDoc && (authormarksUpdate === undefined || authormarksLocal === undefined || JSON.stringify(authormarksUpdate) === JSON.stringify(authormarksLocal))) { return; }
exp.setValueAndCursor(oldDoc, remoteDoc);
};