github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add collapse and expand behaviour to aggregate change entries.

Browse source
This commit is contained in:
Paulo Reis 2017-05-31 16:23:24 +01:00
parent b6cef2e3d7
commit 3cf8f26583
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -225,6 +225,7 @@ 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
@ -233,23 +234,40 @@ define [
for change_id, change of resolvedComments
delete_changes[change_id] = true
potential_aggregate = false
prev_insertion = null
for change in rangesTracker.changes
changed = true
aggregate_entry = false
delete delete_changes[change.id]
entries[change.id] ?= {}
# Update in place to avoid a full DOM redraw via angular
metadata = {}
metadata[key] = value for key, value of change.metadata
if potential_aggregate and change.op.d and change.op.p == prev_insertion.op.p + prev_insertion.op.i.length
aggregate_entry = true
new_entry = {
type: if change.op.i then "insert" else "delete"
content: change.op.i or change.op.d
offset: change.op.p
metadata: change.metadata
}
if aggregate_entry
new_entry.type = "agg-change"
new_entry.metadata.agg_op = entries[prev_insertion.id]
delete entries[prev_insertion.id]
for key, value of new_entry
entries[change.id][key] = value
if change.op.i
potential_aggregate = true
prev_insertion = change
else
potential_aggregate = false
prev_insertion = null
if !$scope.users[change.metadata.user_id]?
refreshChangeUsers(change.metadata.user_id)

6
services/web/public/coffee/ide/review-panel/directives/aggregateChangeEntry.coffee
View file

@ -13,7 +13,7 @@ define [
onIndicatorClick: "&"
onBodyClick: "&"
link: (scope, element, attrs) ->
scope.contentLimit = 40
scope.contentLimit = 35
scope.isCollapsed = true
scope.needsCollapsing = false
@ -26,5 +26,5 @@ define [
$timeout () ->
scope.$emit "review-panel:layout"
# scope.$watch "entry.content.length", (contentLength) ->
# scope.needsCollapsing = contentLength > scope.contentLimit
scope.$watch "entry.content.length + entry.metadata.agg_op.content.length", (contentLength) ->
scope.needsCollapsing = contentLength > scope.contentLimit