github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04: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-15 15:48:17 +00:00
commit 09074f5413
4 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/project/editor/editor.jade
View file

@ -9,7 +9,7 @@ div.full-size(
minimum-restore-size-east="300"
allow-overflow-on="'center'"
)
.ui-layout-center(ng-controller="ReviewPanelController", ng-class="{'has-review-panel': ui.reviewPanelOpen}")
.ui-layout-center(ng-controller="ReviewPanelController", ng-class="{'has-review-panel': ui.reviewPanelOpen, 'has-entries': reviewPanel.hasEntries }")
.loading-panel(ng-show="!editor.sharejs_doc || editor.opening")
span(ng-show="editor.open_doc_id")
i.fa.fa-spin.fa-refresh

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

@ -8,6 +8,7 @@ define [
$scope.reviewPanel =
entries: {}
trackNewChanges: false
hasEntries: false
$scope.commentState =
adding: false
@ -59,6 +60,9 @@ define [
scroller.off "scroll"
$scope.onScroll = null
$scope.$watch (() -> Object.keys($scope.reviewPanel.entries).length), (nEntries) ->
$scope.reviewPanel.hasEntries = nEntries > 0
# If we listen for scroll events in the review panel natively, then with a Mac trackpad
# the scroll is very smooth (natively done I'd guess), but we don't get polled regularly
# enough to keep Ace in step, and it noticeably lags. If instead, we borrow the manual

1
services/web/public/stylesheets/app/editor.less
View file

@ -43,7 +43,6 @@
#editor {
.full-size;
right: @review-off-width;
}
.loading-screen {

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

@ -60,6 +60,7 @@
}
#review-panel {
display: none;
position: absolute;
width: @review-off-width;
top: 0px;
@ -366,6 +367,22 @@
}
}
.has-entries {
#editor {
right: @review-off-width;
.ace-editor-body {
overflow: visible;
.ace_scrollbar-v {
right: -@review-off-width;
}
}
}
#review-panel {
display: block;
}
}
.has-review-panel {
#editor {
right: @review-panel-width;
@ -384,6 +401,7 @@
}
#review-panel {
display: block;
width: @review-panel-width;
overflow: hidden;
}