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

Merge pull request #3484 from overleaf/jpa-hide-ui-below-out-of-sync

Browse source 
[frontend] hide ui elements below the out-of-sync modal

GitOrigin-RevId: 4e48b402522531524f347c784c58f4589b753997
This commit is contained in:
Brian Gough 2020-12-14 09:29:45 +00:00 committed by Copybot
parent ad8f7fbb5d
commit 9a1ef37991
3 changed files with 6 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.pug
View file

@ -20,7 +20,7 @@ block content
p.loading-screen-error(ng-if="state.error").ng-cloak p.loading-screen-error(ng-if="state.error").ng-cloak
span(ng-bind-html="state.error") span(ng-bind-html="state.error")
.global-alerts(ng-cloak) .global-alerts(ng-cloak ng-hide="editor.error_state")
.alert.alert-danger.small(ng-if="connection.forced_disconnect") .alert.alert-danger.small(ng-if="connection.forced_disconnect")
strong #{translate("disconnected")} strong #{translate("disconnected")}
| #{translate("please_refresh")} | #{translate("please_refresh")}

4
services/web/app/views/project/editor/editor.pug
View file

@ -27,7 +27,7 @@ div.full-size(
}" }"
) )
.loading-panel( .loading-panel(
ng-show="!editor.sharejs_doc || editor.opening", ng-show="(!editor.sharejs_doc || editor.opening) && !editor.error_state",
style=showRichText ? "top: 32px" : "", style=showRichText ? "top: 32px" : "",
) )
span(ng-show="editor.open_doc_id") span(ng-show="editor.open_doc_id")
@ -51,7 +51,7 @@ div.full-size(
#editor( #editor(
ace-editor="editor", ace-editor="editor",
ng-if="!editor.showRichText", ng-if="!editor.showRichText",
ng-show="!!editor.sharejs_doc && !editor.opening && multiSelectedCount === 0", ng-show="!!editor.sharejs_doc && !editor.opening && multiSelectedCount === 0 && !editor.error_state",
theme="settings.editorTheme", theme="settings.editorTheme",
keybindings="settings.mode", keybindings="settings.mode",
font-size="settings.fontSize", font-size="settings.fontSize",

3
services/web/frontend/js/ide/editor/EditorManager.js
View file

@ -319,6 +319,9 @@ export default (EditorManager = (function() {
this.ide.socket.disconnect() this.ide.socket.disconnect()
this.ide.reportError(error, meta) this.ide.reportError(error, meta)
// Tell the user about the error state.
this.$scope.editor.error_state = true
this.ide.showOutOfSyncModal( this.ide.showOutOfSyncModal(
'Out of sync', 'Out of sync',
"Sorry, this file has gone out of sync and we need to do a full refresh. <br> <a href='/learn/Kb/Editor_out_of_sync_problems'>Please see this help guide for more information</a>", "Sorry, this file has gone out of sync and we need to do a full refresh. <br> <a href='/learn/Kb/Editor_out_of_sync_problems'>Please see this help guide for more information</a>",