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

DRYness.

Browse source
This commit is contained in:
Paulo Reis 2017-06-01 15:28:37 +01:00
parent 2a0454f2f1
commit b2a7686204
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -337,30 +337,26 @@ define [
} }
for id, entry of entries for id, entry of entries
isChangeEntryAndWithinSelection = false
if entry.type == "comment" and not $scope.reviewPanel.resolvedThreadIds[entry.thread_id] if entry.type == "comment" and not $scope.reviewPanel.resolvedThreadIds[entry.thread_id]
entry.focused = (entry.offset <= selection_offset_start <= entry.offset + entry.content.length) entry.focused = (entry.offset <= selection_offset_start <= entry.offset + entry.content.length)
else if entry.type == "insert" else if entry.type == "insert"
isEntryWithinSelection = entry.offset >= selection_offset_start and entry.offset + entry.content.length <= selection_offset_end isChangeEntryAndWithinSelection = 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) entry.focused = (entry.offset <= selection_offset_start <= entry.offset + entry.content.length)
if isEntryWithinSelection
$scope.reviewPanel.selectedEntryIds.push id
$scope.reviewPanel.nVisibleSelectedChanges++
else if entry.type == "delete" else if entry.type == "delete"
isEntryWithinSelection = selection_offset_start <= entry.offset <= selection_offset_end isChangeEntryAndWithinSelection = selection_offset_start <= entry.offset <= selection_offset_end
entry.focused = (entry.offset == selection_offset_start) entry.focused = (entry.offset == selection_offset_start)
if isEntryWithinSelection
$scope.reviewPanel.selectedEntryIds.push id
$scope.reviewPanel.nVisibleSelectedChanges++
else if entry.type == "agg-change" else if entry.type == "agg-change"
isEntryWithinSelection = entry.offset >= selection_offset_start and entry.offset + entry.content.length <= selection_offset_end isChangeEntryAndWithinSelection = 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) 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 else if entry.type in [ "add-comment", "bulk-actions" ] and selection
entry.focused = true entry.focused = true
if isChangeEntryAndWithinSelection
$scope.reviewPanel.selectedEntryIds.push id
$scope.reviewPanel.selectedEntryIds.push entry.metadata.agg_op_id if entry.type == "agg-change"
$scope.reviewPanel.nVisibleSelectedChanges++
$scope.$broadcast "review-panel:recalculate-screen-positions" $scope.$broadcast "review-panel:recalculate-screen-positions"
$scope.$broadcast "review-panel:layout" $scope.$broadcast "review-panel:layout"
@ -391,17 +387,19 @@ define [
bulkAccept = () -> bulkAccept = () ->
_doAcceptMultipleChanges $scope.reviewPanel.selectedEntryIds.slice() _doAcceptMultipleChanges $scope.reviewPanel.selectedEntryIds.slice()
$scope.reviewPanel.selectedEntryIds = [] $scope.reviewPanel.selectedEntryIds = []
$scope.reviewPanel.nVisibleSelectedChanges = 0
event_tracking.sendMB "rp-bulk-accept", { event_tracking.sendMB "rp-bulk-accept", {
view: if $scope.ui.reviewPanelOpen then $scope.reviewPanel.subView else 'mini', view: if $scope.ui.reviewPanelOpen then $scope.reviewPanel.subView else 'mini',
nEntries: $scope.reviewPanel.selectedEntryIds.length nEntries: $scope.reviewPanel.nVisibleSelectedChanges
} }
bulkReject = () -> bulkReject = () ->
_doRejectMultipleChanges $scope.reviewPanel.selectedEntryIds.slice() _doRejectMultipleChanges $scope.reviewPanel.selectedEntryIds.slice()
$scope.reviewPanel.selectedEntryIds = [] $scope.reviewPanel.selectedEntryIds = []
$scope.reviewPanel.nVisibleSelectedChanges = 0
event_tracking.sendMB "rp-bulk-reject", { event_tracking.sendMB "rp-bulk-reject", {
view: if $scope.ui.reviewPanelOpen then $scope.reviewPanel.subView else 'mini', view: if $scope.ui.reviewPanelOpen then $scope.reviewPanel.subView else 'mini',
nEntries: $scope.reviewPanel.selectedEntryIds.length nEntries: $scope.reviewPanel.nVisibleSelectedChanges
} }
$scope.showBulkAcceptDialog = () -> $scope.showBulkAcceptDialog = () ->