github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-24 03:23:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Trigger selection-related logic after accepting or rejecting changes.

Browse source
This commit is contained in:
Paulo Reis 2017-06-07 14:03:58 +01:00
parent 19ecffd654
commit 53b18e041f
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -210,6 +210,7 @@ define [
acceptChangeIds: (change_ids) ->
@rangesTracker.removeChangeIds(change_ids)
@updateAnnotations()
@updateFocus()
rejectChangeIds: (change_ids) ->
changes = @rangesTracker.getChanges(change_ids)
@ -288,7 +289,8 @@ define [
session.$fromReject = false
else
throw new Error("unknown change: #{JSON.stringify(change)}")
@updateFocus()
removeCommentId: (comment_id) ->
@rangesTracker.removeCommentId(comment_id)
@updateAnnotations()

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

@ -374,9 +374,6 @@ define [
bulkAccept = () ->
_doAcceptChanges $scope.reviewPanel.selectedEntryIds.slice()
$timeout () ->
$scope.reviewPanel.selectedEntryIds = []
$scope.reviewPanel.nVisibleSelectedChanges = 0
event_tracking.sendMB "rp-bulk-accept", {
view: if $scope.ui.reviewPanelOpen then $scope.reviewPanel.subView else 'mini',
nEntries: $scope.reviewPanel.nVisibleSelectedChanges
@ -384,9 +381,6 @@ define [
bulkReject = () ->
_doRejectChanges $scope.reviewPanel.selectedEntryIds.slice()
$timeout () ->
$scope.reviewPanel.selectedEntryIds = []
$scope.reviewPanel.nVisibleSelectedChanges = 0
event_tracking.sendMB "rp-bulk-reject", {
view: if $scope.ui.reviewPanelOpen then $scope.reviewPanel.subView else 'mini',
nEntries: $scope.reviewPanel.nVisibleSelectedChanges