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

Don't flash resolved comments when editor is loading

Browse source
This commit is contained in:
James Allen 2017-01-17 16:55:18 +01:00
parent 5a34d17947
commit 4d15fc30ba
5 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,8 @@ div.full-size(
'rp-state-overview': (reviewPanel.subView === SubViews.OVERVIEW),\
'rp-size-mini': (!ui.reviewPanelOpen && reviewPanel.hasEntries),\
'rp-size-expanded': ui.reviewPanelOpen,\
'rp-layout-left': reviewPanel.layoutToLeft\
'rp-layout-left': reviewPanel.layoutToLeft,\
'rp-loading-threads': reviewPanel.loadingThreads\
}"
)
.loading-panel(ng-show="!editor.sharejs_doc || editor.opening")

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

@ -52,6 +52,7 @@
on-reply="submitReply(entry, entry_id);"
on-indicator-click="toggleReviewPanel();"
permissions="permissions"
ng-if="!reviewPanel.loadingThreads"
)
div(ng-if="entry.type === 'add-comment' && permissions.comment")

2
services/web/public/coffee/ide.coffee
View file

@ -67,7 +67,7 @@ define [
view: "editor"
chatOpen: false
pdfLayout: 'sideBySide'
reviewPanelOpen: localStorage("ui.reviewPanelOpen.#{window.project_id}") and $scope.project.features.trackChanges
reviewPanelOpen: localStorage("ui.reviewPanelOpen.#{window.project_id}")
showCodeCheckerOnboarding: !window.userSettings.syntaxValidation?
}
$scope.user = window.user

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

@ -25,6 +25,7 @@ define [
resolvedThreadIds: {}
layoutToLeft: false
rendererData: {}
loadingThreads: false
$scope.$on "layout:pdf:linked", (event, state) ->
$scope.reviewPanel.layoutToLeft = (state.east?.size < 220 || state.east?.initClosed)
@ -403,8 +404,10 @@ define [
# We get any updates in real time so only need to load them once.
return
_threadsLoaded = true
$scope.reviewPanel.loadingThreads = true
$http.get "/project/#{$scope.project_id}/threads"
.success (threads) ->
$scope.reviewPanel.loadingThreads = false
for thread_id, _ of $scope.reviewPanel.resolvedThreadIds
delete $scope.reviewPanel.resolvedThreadIds[thread_id]
for thread_id, thread of threads

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

@ -692,7 +692,7 @@
.track-changes-marker-callout {
border-radius: 0;
position: absolute;
.rp-state-overview & {
.rp-state-overview &, .rp-loading-threads & {
display: none;
}
}
@ -709,6 +709,9 @@
.track-changes-marker {
border-radius: 0;
position: absolute;
.rp-loading-threads & {
display: none;
}
}
.track-changes-comment-marker {