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 collapsing behaviour to long entries.

Browse source
This commit is contained in:
Paulo Reis 2017-01-13 15:30:31 +00:00
parent b6ea338ff8
commit 5eece9f5d9
3 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
services/web/app/views/project/editor/review-panel.jade
View file

@ -137,9 +137,19 @@ script(type='text/ng-template', id='changeEntryTemplate')
.rp-entry-details
.rp-entry-description(ng-switch="entry.type")
span(ng-switch-when="insert") Added 
ins.rp-content-highlight {{ entry.content }}
ins.rp-content-highlight {{ entry.content | limitTo:(isCollapsed ? contentLimit : entry.content.length) }}
a.rp-collapse-toggle(
href
ng-if="needsCollapsing"
ng-click="toggleCollapse();"
)  {{ isCollapsed ? '(more)' : '(less)' }}
span(ng-switch-when="delete") Deleted 
del.rp-content-highlight {{ entry.content }}
del.rp-content-highlight {{ entry.content | limitTo:(isCollapsed ? contentLimit : entry.content.length) }}
a.rp-collapse-toggle(
href
ng-if="needsCollapsing"
ng-click="toggleCollapse();"
)  {{ isCollapsed ? '(more)' : '(less)' }}
.rp-entry-metadata
| {{ entry.metadata.ts | date : 'MMM d, y h:mm a' }} • 
span.rp-entry-user(style="color: hsl({{ user.hue }}, 70%, 40%);") {{ user.name }}

12
services/web/public/coffee/ide/review-panel/directives/changeEntry.coffee
View file

@ -1,7 +1,7 @@
define [
"base"
], (App) ->
App.directive "changeEntry", () ->
App.directive "changeEntry", ($timeout) ->
restrict: "E"
templateUrl: "changeEntryTemplate"
scope:
@ -11,4 +11,12 @@ define [
onAccept: "&"
onReject: "&"
onIndicatorClick: "&"
link: (scope, element, attrs) ->
scope.contentLimit = 40
scope.needsCollapsing = scope.entry.content.length > scope.contentLimit
scope.isCollapsed = true
scope.toggleCollapse = () ->
scope.isCollapsed = !scope.isCollapsed
$timeout () ->
scope.$emit "review-panel:layout"

11
services/web/public/stylesheets/app/editor/review-panel.less
View file

@ -785,3 +785,14 @@
padding: 5px;
overflow-y: auto;
}
.rp-collapse-toggle {
color: @rp-type-blue;
font-weight: @rp-semibold-weight;
&:hover,
&:focus {
color: darken(@rp-type-blue, 5%);
text-decoration: none;
}
}