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 a single entry for bulk actions.

Browse source
This commit is contained in:
Paulo Reis 2017-05-02 15:43:45 +01:00
parent d874eb70f8
commit 76ea497b33
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/web/app/views/project/editor/review-panel.pug
View file

@ -82,10 +82,8 @@
on-submit="submitNewComment(content);"
on-cancel="cancelNewComment();"
)
div(ng-if="entry.type === 'bulk-accept'")
| Bulk accept
div(ng-if="entry.type === 'bulk-reject'")
| Bulk reject
div(ng-if="entry.type === 'bulk-actions'")
| Bulk actions.
.rp-entry-list(
ng-if="reviewPanel.subView === SubViews.OVERVIEW"

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

@ -159,7 +159,7 @@ define [
entries = $scope.reviewPanel.entries[$scope.editor.open_doc_id] or {}
permEntries = {}
for entry, entryData of entries
if entry not in [ "add-comment", "bulk-accept", "bulk-reject" ]
if entry not in [ "add-comment", "bulk-actions" ]
permEntries[entry] = entryData
Object.keys(permEntries).length
), (nEntries) ->
@ -285,8 +285,7 @@ define [
entries = getDocEntries(doc_id)
delete entries["add-comment"]
delete entries["bulk-accept"]
delete entries["bulk-reject"]
delete entries["bulk-actions"]
if selection
entries["add-comment"] = {
@ -294,13 +293,8 @@ define [
offset: selection_offset_start
length: selection_offset_end - selection_offset_start
}
entries["bulk-accept"] = {
type: "bulk-accept"
offset: selection_offset_start
length: selection_offset_end - selection_offset_start
}
entries["bulk-reject"] = {
type: "bulk-reject"
entries["bulk-actions"] = {
type: "bulk-actions"
offset: selection_offset_start
length: selection_offset_end - selection_offset_start
}
@ -312,7 +306,7 @@ define [
entry.focused = (entry.offset <= selection_offset_start <= entry.offset + entry.content.length)
else if entry.type == "delete"
entry.focused = (entry.offset == selection_offset_start)
else if entry.type in [ "add-comment", "bulk-accept", "bulk-reject" ] and selection
else if entry.type in [ "add-comment", "bulk-actions" ] and selection
entry.focused = true
$scope.$broadcast "review-panel:recalculate-screen-positions"