mirror of
https://github.com/overleaf/overleaf.git
synced 2025-01-23 19:02:57 +00:00
Show nice error page if socket.io could not be loaded
This commit is contained in:
parent
d376acdaa9
commit
bb61dfe34a
3 changed files with 11 additions and 1 deletions
|
@ -13,6 +13,7 @@ block content
|
|||
h3 #{translate("loading")}...
|
||||
.progress
|
||||
.progress-bar(style="width: 20%", ng-style="{'width': state.load_progress + '%'}")
|
||||
p.text-center.text-danger(ng-if="state.error").ng-cloak {{ state.error }}
|
||||
|
||||
.global-alerts(ng-cloak)
|
||||
.alert.alert-danger.small(ng-if="connection.forced_disconnect")
|
||||
|
@ -74,7 +75,7 @@ block content
|
|||
.modal-footer
|
||||
button.btn.btn-info(ng-click="done()") #{translate("ok")}
|
||||
|
||||
script(src='#{settings.websocketsUrl}/socket.io/socket.io.js')
|
||||
script(src='/socket.io/socket.io.js')
|
||||
|
||||
//- We need to do .replace(/\//g, '\\/') do that '</script>' -> '<\/script>'
|
||||
//- and doesn't prematurely end the script tag.
|
||||
|
|
|
@ -51,6 +51,7 @@ define [
|
|||
$scope.state = {
|
||||
loading: true
|
||||
load_progress: 40
|
||||
error: null
|
||||
}
|
||||
$scope.ui = {
|
||||
leftMenuShown: false
|
||||
|
|
|
@ -1,6 +1,14 @@
|
|||
define [], () ->
|
||||
class ConnectionManager
|
||||
constructor: (@ide, @$scope) ->
|
||||
if !io?
|
||||
console.error "Socket.io javascript not loaded. Please check that the real-time service is running and accessible."
|
||||
@ide.socket =
|
||||
on: () ->
|
||||
$scope.$apply () =>
|
||||
@$scope.state.error = "Could not connect to websocket server :("
|
||||
return
|
||||
|
||||
@connected = false
|
||||
|
||||
@$scope.connection =
|
||||
|
|
Loading…
Reference in a new issue