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

Refactor accept and reject methods to support multiple changes; support bulk actions events.

Browse source
This commit is contained in:
Paulo Reis 2017-05-16 14:27:06 +01:00
parent 36b4a8e6c2
commit 7f3c0ed5ac
2 changed files with 40 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,10 +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) =>
@acceptChangeIds(change_ids)
@$scope.$on "change:bulk-reject", (e, 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)
@ -207,31 +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) @rangesTracker.removeChangeIds(change_ids)
@updateAnnotations() @updateAnnotations()
rejectChangeId: (change_id) -> rejectChangeIds: (change_ids) ->
change = @rangesTracker.getChange(change_id) changes = @rangesTracker.getChanges(change_ids)
return if !change? return if changes.length == 0
session = @editor.getSession() session = @editor.getSession()
if change.op.d? for change in changes
content = change.op.d if change.op.d?
position = @_shareJsOffsetToAcePosition(change.op.p) content = change.op.d
session.$fromReject = true # Tell track changes to cancel out delete position = @_shareJsOffsetToAcePosition(change.op.p)
session.insert(position, content) session.$fromReject = true # Tell track changes to cancel out delete
session.$fromReject = false session.insert(position, content)
else if change.op.i? session.$fromReject = false
start = @_shareJsOffsetToAcePosition(change.op.p) else if change.op.i?
end = @_shareJsOffsetToAcePosition(change.op.p + change.op.i.length) start = @_shareJsOffsetToAcePosition(change.op.p)
editor_text = session.getDocument().getTextRange({start, end}) end = @_shareJsOffsetToAcePosition(change.op.p + change.op.i.length)
if editor_text != change.op.i editor_text = session.getDocument().getTextRange({start, end})
throw new Error("Op to be removed (#{JSON.stringify(change.op)}), does not match editor text, '#{editor_text}'") if editor_text != change.op.i
session.$fromReject = true throw new Error("Op to be removed (#{JSON.stringify(change.op)}), does not match editor text, '#{editor_text}'")
session.remove({start, end}) session.$fromReject = true
session.$fromReject = false session.remove({start, end})
else session.$fromReject = false
throw new Error("unknown change: #{JSON.stringify(change)}") else
throw new Error("unknown change: #{JSON.stringify(change)}")
removeCommentId: (comment_id) -> removeCommentId: (comment_id) ->
@rangesTracker.removeCommentId(comment_id) @rangesTracker.removeCommentId(comment_id)

8
services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
View file

@ -76,6 +76,14 @@ define [
$scope.$broadcast "change:accept", change_id $scope.$broadcast "change:accept", change_id
updateEntries(doc_id) updateEntries(doc_id)
$scope.$apply () -> $scope.$apply () ->
ide.socket.on "accept-changes", (doc_id, change_ids) ->
if doc_id != $scope.editor.open_doc_id
getChangeTracker(doc_id).removeChangeIds(change_ids)
else
$scope.$broadcast "change:bulk-accept", change_ids
updateEntries(doc_id)
$scope.$apply () ->
ide.socket.on "resolve-thread", (thread_id, user) -> ide.socket.on "resolve-thread", (thread_id, user) ->
_onCommentResolved(thread_id, user) _onCommentResolved(thread_id, user)