agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-29 12:01:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Integrate aggregate changes with bulk actions.

Browse Source
This commit is contained in:
Paulo Reis
2017-06-01 15:18:43 +01:00
parent 1490ea7b04
commit 2a0454f2f1
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/web/app/views/project/editor/review-panel.pug
View File

@@ -8,20 +8,20 @@
) !{translate("track_changes_is_on")}
a.rp-bulk-actions-btn(
href
ng-if="reviewPanel.selectedEntryIds.length > 1"
ng-if="reviewPanel.nVisibleSelectedChanges > 1"
ng-click="showBulkAcceptDialog();"
)
i.fa.fa-check
|  #{translate("accept_all")}
| ({{ reviewPanel.selectedEntryIds.length }})
| ({{ reviewPanel.nVisibleSelectedChanges }})
a.rp-bulk-actions-btn(
href
ng-if="reviewPanel.selectedEntryIds.length > 1"
ng-if="reviewPanel.nVisibleSelectedChanges > 1"
ng-click="showBulkRejectDialog();"
)
i.fa.fa-times
|  #{translate("reject_all")}
| ({{ reviewPanel.selectedEntryIds.length }})
| ({{ reviewPanel.nVisibleSelectedChanges }})
a.rp-add-comment-btn(
href
ng-if="reviewPanel.entries[editor.open_doc_id]['add-comment'] != null"
@@ -117,7 +117,7 @@
bulk-actions-entry(
on-bulk-accept="showBulkAcceptDialog();"
on-bulk-reject="showBulkRejectDialog();"
n-entries="reviewPanel.selectedEntryIds.length"
n-entries="reviewPanel.nVisibleSelectedChanges"
)
.rp-entry-list(

21
services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
View File

@@ -230,7 +230,6 @@ define [
changed = false
# Assume we'll delete everything until we see it, then we'll remove it from this object
delete_changes = {}
for change_id, change of entries
@@ -321,8 +320,7 @@ define [
# All selected changes will be added to this array.
$scope.reviewPanel.selectedEntryIds = []
# Count of user-visible changes, i.e. an aggregated change will count as one.
$scope.nVisibleSelectedChanges = 0
console.log selection_offset_start, selection_offset_end
$scope.reviewPanel.nVisibleSelectedChanges = 0
delete entries["add-comment"]
delete entries["bulk-actions"]
@@ -344,11 +342,22 @@ define [
else if entry.type == "insert"
isEntryWithinSelection = entry.offset >= selection_offset_start and entry.offset + entry.content.length <= selection_offset_end
entry.focused = (entry.offset <= selection_offset_start <= entry.offset + entry.content.length)
$scope.reviewPanel.selectedEntryIds.push id if isEntryWithinSelection
if isEntryWithinSelection
$scope.reviewPanel.selectedEntryIds.push id
$scope.reviewPanel.nVisibleSelectedChanges++
else if entry.type == "delete"
isEntryWithinSelection = selection_offset_start <= entry.offset <= selection_offset_end
entry.focused = (entry.offset == selection_offset_start)
$scope.reviewPanel.selectedEntryIds.push id if isEntryWithinSelection
if isEntryWithinSelection
$scope.reviewPanel.selectedEntryIds.push id
$scope.reviewPanel.nVisibleSelectedChanges++
else if entry.type == "agg-change"
isEntryWithinSelection = entry.offset >= selection_offset_start and entry.offset + entry.content.length <= selection_offset_end
entry.focused = (entry.offset <= selection_offset_start <= entry.offset + entry.content.length)
if isEntryWithinSelection
$scope.reviewPanel.selectedEntryIds.push id, entry.metadata.agg_op_id
$scope.reviewPanel.nVisibleSelectedChanges++
else if entry.type in [ "add-comment", "bulk-actions" ] and selection
entry.focused = true
@@ -406,7 +415,7 @@ define [
controller: "BulkActionsModalController"
resolve:
isAccept: () -> isAccept
nChanges: () -> $scope.reviewPanel.selectedEntryIds.length
nChanges: () -> $scope.reviewPanel.nVisibleSelectedChanges
scope: $scope.$new()
}).result.then (isAccept) ->
if isAccept