|
|
@ -110,6 +110,10 @@ define([
|
|
|
|
return stringify(obj);
|
|
|
|
return stringify(obj);
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var drawPreview = Cryptpad.throttle(function () {
|
|
|
|
|
|
|
|
DiffMd.apply(DiffMd.render(editor.getValue()), $preview);
|
|
|
|
|
|
|
|
}, 150);
|
|
|
|
|
|
|
|
|
|
|
|
var onLocal = config.onLocal = function () {
|
|
|
|
var onLocal = config.onLocal = function () {
|
|
|
|
if (initializing) { return; }
|
|
|
|
if (initializing) { return; }
|
|
|
|
if (isHistoryMode) { return; }
|
|
|
|
if (isHistoryMode) { return; }
|
|
|
@ -117,7 +121,7 @@ define([
|
|
|
|
|
|
|
|
|
|
|
|
editor.save();
|
|
|
|
editor.save();
|
|
|
|
|
|
|
|
|
|
|
|
DiffMd.apply(DiffMd.render(editor.getValue()), $preview);
|
|
|
|
drawPreview();
|
|
|
|
|
|
|
|
|
|
|
|
var textValue = canonicalize(CodeMirror.$textarea.val());
|
|
|
|
var textValue = canonicalize(CodeMirror.$textarea.val());
|
|
|
|
var shjson = stringifyInner(textValue);
|
|
|
|
var shjson = stringifyInner(textValue);
|
|
|
@ -324,14 +328,13 @@ define([
|
|
|
|
var hjson = JSON.parse(shjson);
|
|
|
|
var hjson = JSON.parse(shjson);
|
|
|
|
var remoteDoc = hjson.content;
|
|
|
|
var remoteDoc = hjson.content;
|
|
|
|
|
|
|
|
|
|
|
|
DiffMd.apply(DiffMd.render(remoteDoc), $preview);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var highlightMode = hjson.highlightMode;
|
|
|
|
var highlightMode = hjson.highlightMode;
|
|
|
|
if (highlightMode && highlightMode !== APP.highlightMode) {
|
|
|
|
if (highlightMode && highlightMode !== APP.highlightMode) {
|
|
|
|
CodeMirror.setMode(highlightMode, onModeChanged);
|
|
|
|
CodeMirror.setMode(highlightMode, onModeChanged);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
CodeMirror.setValueAndCursor(oldDoc, remoteDoc, TextPatcher);
|
|
|
|
CodeMirror.setValueAndCursor(oldDoc, remoteDoc, TextPatcher);
|
|
|
|
|
|
|
|
drawPreview();
|
|
|
|
|
|
|
|
|
|
|
|
if (!readOnly) {
|
|
|
|
if (!readOnly) {
|
|
|
|
var textValue = canonicalize(CodeMirror.$textarea.val());
|
|
|
|
var textValue = canonicalize(CodeMirror.$textarea.val());
|
|
|
|