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

Merge pull request #4407 from FinnStutzenstein/noOfflineMessageOnProjector

Browse Source 
Hide the offline message on the projector
This commit is contained in:
Emanuel Schütze 2019-02-26 14:45:28 +01:00 committed by GitHub
commit 393b5f095f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/src/app/core/core-services/websocket.service.ts
View File

@ -1,5 +1,6 @@
import { Injectable, NgZone, EventEmitter } from '@angular/core'; import { Injectable, NgZone, EventEmitter } from '@angular/core';
import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material';
import { Router } from '@angular/router';
import { Observable, Subject } from 'rxjs'; import { Observable, Subject } from 'rxjs';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
@ -76,8 +77,14 @@ export class WebsocketService {
* @param matSnackBar * @param matSnackBar
* @param zone * @param zone
* @param translate * @param translate
* @param router
*/ */
public constructor(private matSnackBar: MatSnackBar, private zone: NgZone, public translate: TranslateService) {} public constructor(
private matSnackBar: MatSnackBar,
private zone: NgZone,
public translate: TranslateService,
private router: Router
) {}
/** /**
* Creates a new WebSocket connection and handles incomming events. * Creates a new WebSocket connection and handles incomming events.
@ -155,8 +162,11 @@ export class WebsocketService {
this.websocket = null; this.websocket = null;
this.connectionOpen = false; this.connectionOpen = false;
if (event.code !== 1000) { if (event.code !== 1000) {
// Do not show the message snackbar on the projector
// tests for /projector and /projector/<id>
const onProjector = this.router.url.match(/^\/projector(\/[0-9]+\/?)?$/);
// 1000 is a normal close, like the close on logout // 1000 is a normal close, like the close on logout
if (!this.connectionErrorNotice) { if (!this.connectionErrorNotice && !onProjector) {
// So here we have a connection failure that wasn't intendet. // So here we have a connection failure that wasn't intendet.
this.connectionErrorNotice = this.matSnackBar.open( this.connectionErrorNotice = this.matSnackBar.open(
this.translate.instant('Offline mode: You can use OpenSlides but changes are not saved.'), this.translate.instant('Offline mode: You can use OpenSlides but changes are not saved.'),