github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-15 22:27:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel

Browse source
This commit is contained in:
James Allen 2016-11-18 15:47:06 +00:00
commit 107f86fb2b
4 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -154,6 +154,7 @@ script(type='text/ng-template', id='commentEntryTemplate')
textarea.rp-comment-input(
ng-model="entry.replyContent"
ng-keypress="handleCommentReplyKeyPress($event);"
stop-propagation="click"
placeholder="{{ 'Hit \"Enter\" to reply' + (entry.resolved ? ' and re-open' : '') }}"
)
.rp-comment-resolved-description(ng-if="entry.resolved && !entry.showWhenResolved")

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

@ -38,8 +38,6 @@ define [
$scope.$watch "reviewPanel.subView", (subView) ->
return if !subView?
updateScrollbar()
if subView == $scope.SubViews.CUR_FILE
$scope.$broadcast "review-panel:layout"
$scope.$watch "ui.reviewPanelOpen", (open) ->
return if !open?
@ -155,7 +153,7 @@ define [
$scope.setSubView = (subView) ->
$scope.reviewPanel.subView = subView
$scope.gotoEntry = (doc_id, entry) ->
console.log "Going to entry", entry.docPos
ide.editorManager.openDocId(doc_id, { gotoLine: entry.docPos.row + 1, gotoColumn: entry.docPos.column })

7
services/web/public/coffee/ide/review-panel/directives/reviewPanelSorted.coffee
View file

@ -79,12 +79,15 @@ define [
entry.$callout_el.css(top: top + line_height + 1, height: original_top - top)
sl_console.log "ENTRY", {entry: entry.scope.entry, top}
scope.$applyAsync () ->
layout()
scope.$watch "reviewPanel.entryGeneration", (value) ->
scope.$evalAsync () ->
scope.$applyAsync () ->
layout()
scope.$on "review-panel:layout", () ->
scope.$evalAsync () ->
scope.$applyAsync () ->
layout()
## Scroll lock with Ace

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

@ -203,8 +203,10 @@
}
}
.rp-state-overview & {
border-radius: 0;
padding: 2px 5px;
border-bottom: solid 1px @rp-border-grey;
cursor: pointer;
}
border-left: solid @rp-entry-ribbon-width transparent;
@ -328,6 +330,11 @@
display: flex;
align-items: flex-start;
padding: 5px;
.rp-state-overview & {
padding: 3px 0;
line-height: 1.2;
}
}
.rp-comment-body {
position: relative;
@ -369,6 +376,10 @@
.rp-comment-reply {
padding: 0 5px;
.rp-state-overview & {
padding: 3px 0 0;
}
}
.rp-add-comment-btn {