github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-01 22:44:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix logic around not tracking rejections to changes

Browse source
This commit is contained in:
James Allen 2016-11-10 10:58:55 +00:00
parent 4e2dd55cfd
commit 938a8c4894
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee
View file

@ -67,8 +67,13 @@ define [
@nextUpdateMetaData = null
else
user_id = window.user.id
was_tracking = @changesTracker.track_changes
if @dont_track_next_update
@changesTracker.track_changes = false
@dont_track_next_update = false
@applyChange(e, { user_id })
@changesTracker.track_changes = was_tracking
# TODO: Just for debugging, remove before going live.
setTimeout () =>
@ -122,8 +127,7 @@ define [
change = @changesTracker.getChange(change_id)
return if !change?
@changesTracker.removeChangeId(change_id)
is_tracking = @changesTracker.track_changes
@changesTracker.track_changes = false
@dont_track_next_update = true
session = @editor.getSession()
if change.op.d?
content = change.op.d
@ -138,9 +142,7 @@ define [
session.remove({start, end})
else
throw new Error("unknown change: #{JSON.stringify(change)}")
setTimeout () =>
@changesTracker.track_changes = is_tracking
, 0
checkMapping: () ->
session = @editor.getSession()