github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-10 17:17:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reflect accepted changes on the UI layer.

Browse source
This commit is contained in:
Paulo Reis 2017-05-04 15:47:25 +01:00
parent 19828d3c5b
commit f25db3ff64
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,9 @@ define [
@$scope.$on "change:reject", (e, change_id) =>
@rejectChangeId(change_id)
@$scope.$on "change:bulk-accept", (e, change_ids) =>
@bulkAcceptChangeIds(change_ids)
@$scope.$on "change:bulk-reject", (e, change_ids) =>
@bulkRejectChangeIds(change_ids)
@ -237,7 +240,9 @@ define [
throw new Error("unknown change: #{JSON.stringify(change)}")
bulkAcceptChangeIds: (change_ids) ->
console.log change_id for change_id in change_ids
for change_id in change_ids
@rangesTracker.removeChangeId(change_id)
@updateAnnotations()
bulkRejectChangeIds: (change_ids) ->
for change_id in change_ids

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

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