github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into sk-passport-saml

Browse source
This commit is contained in:
Shane Kilkelly 2016-11-14 16:11:24 +00:00
commit b67a65ff6a
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/web/public/coffee/ide/editor/directives/aceEditor/undo/UndoManager.coffee
View file

@ -207,15 +207,18 @@ define [
return doc.split("\n") return doc.split("\n")
_aceDeltaSetsToSimpleDeltaSets: (aceDeltaSets, docLines) -> _aceDeltaSetsToSimpleDeltaSets: (aceDeltaSets, docLines) ->
simpleDeltaSets = []
for deltaSet in aceDeltaSets for deltaSet in aceDeltaSets
if deltaSet.group == "doc" # ignore fold changes
simpleDeltas = [] simpleDeltas = []
for delta in deltaSet.deltas for delta in deltaSet.deltas
simpleDeltas.push @_aceDeltaToSimpleDelta(delta, docLines) simpleDeltas.push @_aceDeltaToSimpleDelta(delta, docLines)
docLines = @_applyAceDeltasToDocLines([delta], docLines) docLines = @_applyAceDeltasToDocLines([delta], docLines)
{ simpleDeltaSets.push {
deltas: simpleDeltas deltas: simpleDeltas
group: deltaSet.group group: deltaSet.group
} }
return simpleDeltaSets
_simpleDeltaSetsToAceDeltaSets: (simpleDeltaSets, docLines) -> _simpleDeltaSetsToAceDeltaSets: (simpleDeltaSets, docLines) ->
for deltaSet in simpleDeltaSets for deltaSet in simpleDeltaSets