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

Merge pull request #5981 from FinnStutzenstein/spinnerErrors

Browse Source 
Do not show old errors on the spinner
This commit is contained in:
Finn Stutzenstein 2021-04-01 09:02:57 +02:00 committed by GitHub
commit 28980afbd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/app/shared/components/global-spinner/global-spinner.component.ts
View File

@ -31,11 +31,6 @@ export class GlobalSpinnerComponent implements OnInit, OnDestroy {
*/ */
private spinnerSubscription: Subscription; private spinnerSubscription: Subscription;
/**
* Constant string as default message when the spinner is shown.
*/
private LOADING = this.translate.instant('Loading data. Please wait ...');
public error: ErrorInformation | null = null; public error: ErrorInformation | null = null;
/** /**
@ -64,10 +59,11 @@ export class GlobalSpinnerComponent implements OnInit, OnDestroy {
this.spinnerSubscription = this.overlayService // subscribe to the service. this.spinnerSubscription = this.overlayService // subscribe to the service.
.getSpinner() .getSpinner()
.subscribe((value: { isVisible: boolean; text: string }) => { .subscribe((value: { isVisible: boolean; text: string }) => {
this.error = null;
this.isVisible = value.isVisible; this.isVisible = value.isVisible;
this.text = this.translate.instant(value.text); this.text = this.translate.instant(value.text);
if (!this.text) { if (!this.text) {
this.text = this.LOADING; this.text = this.translate.instant('Loading data. Please wait ...');
} }
this.cd.detectChanges(); this.cd.detectChanges();
}); });