github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Use new ranges tracker method to get N changes at once; small refactor.

Browse source
This commit is contained in:
Paulo Reis 2017-05-15 11:24:40 +01:00
parent 7bb5d65b52
commit f4e46bb2f9
1 changed files with 27 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,16 +27,16 @@ define [
@selectLineIfNoSelection() @selectLineIfNoSelection()
@$scope.$on "change:accept", (e, change_id) => @$scope.$on "change:accept", (e, change_id) =>
@acceptChangeId(change_id) @acceptChangeIds([ change_id ])
@$scope.$on "change:reject", (e, change_id) => @$scope.$on "change:reject", (e, change_id) =>
@rejectChangeId(change_id) @rejectChangeIds([ change_id ])
@$scope.$on "change:bulk-accept", (e, change_ids) => @$scope.$on "change:bulk-accept", (e, change_ids) =>
@bulkAcceptChangeIds(change_ids) @acceptChangeIds(change_ids)
@$scope.$on "change:bulk-reject", (e, change_ids) => @$scope.$on "change:bulk-reject", (e, change_ids) =>
@bulkRejectChangeIds(change_ids) @rejectChangeIds(change_ids)
@$scope.$on "comment:remove", (e, comment_id) => @$scope.$on "comment:remove", (e, comment_id) =>
@removeCommentId(comment_id) @removeCommentId(comment_id)
@ -213,39 +213,32 @@ define [
if @editor.selection.isEmpty() if @editor.selection.isEmpty()
@editor.selection.selectLine() @editor.selection.selectLine()
acceptChangeId: (change_id) -> acceptChangeIds: (change_ids) ->
@rangesTracker.removeChangeId(change_id)
@updateAnnotations()
rejectChangeId: (change_id) ->
change = @rangesTracker.getChange(change_id)
return if !change?
session = @editor.getSession()
if change.op.d?
content = change.op.d
position = @_shareJsOffsetToAcePosition(change.op.p)
session.$fromReject = true # Tell track changes to cancel out delete
session.insert(position, content)
session.$fromReject = false
else if change.op.i?
start = @_shareJsOffsetToAcePosition(change.op.p)
end = @_shareJsOffsetToAcePosition(change.op.p + change.op.i.length)
editor_text = session.getDocument().getTextRange({start, end})
if editor_text != change.op.i
throw new Error("Op to be removed (#{JSON.stringify(change.op)}), does not match editor text, '#{editor_text}'")
session.$fromReject = true
session.remove({start, end})
session.$fromReject = false
else
throw new Error("unknown change: #{JSON.stringify(change)}")
bulkAcceptChangeIds: (change_ids) ->
@rangesTracker.removeChangeIds(change_ids) @rangesTracker.removeChangeIds(change_ids)
@updateAnnotations() @updateAnnotations()
bulkRejectChangeIds: (change_ids) -> rejectChangeIds: (change_ids) ->
for change_id in change_ids changes = @rangesTracker.getChanges(change_ids)
@rejectChangeId change_id return if changes.length == 0
session = @editor.getSession()
for change in changes
if change.op.d?
content = change.op.d
position = @_shareJsOffsetToAcePosition(change.op.p)
session.$fromReject = true # Tell track changes to cancel out delete
session.insert(position, content)
session.$fromReject = false
else if change.op.i?
start = @_shareJsOffsetToAcePosition(change.op.p)
end = @_shareJsOffsetToAcePosition(change.op.p + change.op.i.length)
editor_text = session.getDocument().getTextRange({start, end})
if editor_text != change.op.i
throw new Error("Op to be removed (#{JSON.stringify(change.op)}), does not match editor text, '#{editor_text}'")
session.$fromReject = true
session.remove({start, end})
session.$fromReject = false
else
throw new Error("unknown change: #{JSON.stringify(change)}")
removeCommentId: (comment_id) -> removeCommentId: (comment_id) ->
@rangesTracker.removeCommentId(comment_id) @rangesTracker.removeCommentId(comment_id)