github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-29 08:32:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2043 from overleaf/bg-preserve-undo-in-rich-text

Browse source 
preserve the undo flag in rich text

GitOrigin-RevId: 3c7b770d9aa41daf76783333db6beb99f1156c9a
This commit is contained in:
Jessica Lawshe 2019-10-17 10:31:09 -05:00 committed by sharelatex
parent 34c04660a6
commit 5d3c125ffb
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
services/web/public/js/libs/sharejs.js
View file

@ -1607,7 +1607,7 @@ define(['ace/ace','crypto-js/sha1'], function (_ignore, CryptoJSSHA1) {
// It is heavily inspired from the Ace editor hook.
// Convert a CodeMirror delta into an op understood by share.js
var applyCMToShareJS = function applyCMToShareJS(editorDoc, delta, doc) {
var applyCMToShareJS = function applyCMToShareJS(editorDoc, delta, doc, fromUndo) {
// CodeMirror deltas give a text replacement.
// I tuned this operation a little bit, for speed.
var startPos = 0; // Get character position from # of chars in each line.
@ -1622,10 +1622,10 @@ define(['ace/ace','crypto-js/sha1'], function (_ignore, CryptoJSSHA1) {
startPos += delta.from.ch;
if (delta.removed) {
doc.del(startPos, delta.removed.join('\n').length);
doc.del(startPos, delta.removed.join('\n').length, fromUndo);
}
if (delta.text) {
return doc.insert(startPos, delta.text.join('\n'));
return doc.insert(startPos, delta.text.join('\n'), fromUndo);
}
};
@ -1676,7 +1676,8 @@ define(['ace/ace','crypto-js/sha1'], function (_ignore, CryptoJSSHA1) {
if (suppress) {
return;
}
applyCMToShareJS(editorDoc, change, sharedoc);
var fromUndo = (change.origin === 'undo')
applyCMToShareJS(editorDoc, change, sharedoc, fromUndo);
return check();
};