ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3305 from FinnStutzenstein/projector-is-stuck

Browse Source 
fix projector reconnecting if websocket is closed
This commit is contained in:
Norman Jäckel 2017-06-21 21:44:49 +02:00 committed by GitHub
commit 79b48e7054
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openslides/core/static/js/core/projector.js
View File

@ -9,9 +9,24 @@ angular.module('OpenSlidesApp.core.projector', ['OpenSlidesApp.core'])
.constant('REALM', 'projector')
.run([
'$http',
'autoupdate',
function (autoupdate) {
'DS',
function ($http, autoupdate, DS) {
autoupdate.newConnect();
// If the connection aborts, we try to ping the server with whoami requests. If
// the server is flushed, we clear the datastore, so the message 'this projector
// cannot be shown' will be displayed. Otherwise establish the websocket connection.
autoupdate.registerRetryConnectCallback(function () {
return $http.get('/users/whoami').then(function (success) {
if (success.data.user_id === null && !success.data.guest_enabled) {
DS.clear();
} else {
autoupdate.newConnect();
}
});
});
}
])