infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix a race condition that could wiped the content of coed and slide

pull/1/head
yflory 2018-01-16 12:05:26 +01:00
parent 88a04fdb07
commit f79e1dfda0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@ define([
mode: defaultMode || "javascript",
readOnly: true
});
editor.setValue(Messages.codeInitialState);
//editor.setValue(Messages.codeInitialState);
editor.focus();
var setMode = exp.setMode = function (mode, cb) {
@ -311,7 +311,7 @@ define([
exp.contentUpdate = function (newContent) {
var oldDoc = canonicalize($textarea.val());
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)
@ -321,7 +321,7 @@ define([
exp.getContent = function () {
editor.save();
return { content: canonicalize($textarea.val()) };
return { content: canonicalize(editor.getValue()) };
};
exp.mkFileManager = function (framework) {