MTAS/mtas-tv-frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* route subscription changed to ActivationStart to manage timing issue in navigation timer

Browse Source
This commit is contained in:
Dávid Danyi 2018-04-23 11:34:51 +02:00
parent 8595919cb6
commit 47eaae25d7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/admin/dashboard/dashboard.component.html
View File

@ -2,7 +2,7 @@
<h1 class="ui dividing header">Dashboard</h1> <h1 class="ui dividing header">Dashboard</h1>
<div class="ui four cards"> <div class="ui four cards">
<a class="ui raised yellow card" [routerLink]="['/commit-tracker']"> <a class="ui raised yellow card" [routerLink]="['/kanban']">
<div class="content"> <div class="content">
<div class="header">Start slideshow</div> <div class="header">Start slideshow</div>
<div class="meta"> <div class="meta">

6
src/app/shared/service/timer.service.ts
View File

@ -4,7 +4,7 @@ import { SettingsService } from './settings.service';
import { SelfUpdaterService } from './self-updater.service'; import { SelfUpdaterService } from './self-updater.service';
import { TimerObservable } from 'rxjs/observable/TimerObservable'; import { TimerObservable } from 'rxjs/observable/TimerObservable';
import { Subscription } from 'rxjs/Subscription'; import { Subscription } from 'rxjs/Subscription';
import { ActivationEnd, Router } from '@angular/router'; import { ActivationStart, Router } from '@angular/router';
import { SlideShowService } from '../../display/slide-show.service'; import { SlideShowService } from '../../display/slide-show.service';
import 'rxjs/add/operator/filter'; import 'rxjs/add/operator/filter';
import 'rxjs/add/operator/switchMap'; import 'rxjs/add/operator/switchMap';
@ -35,8 +35,8 @@ export class TimerService implements OnDestroy {
this.autoSwitch = false; this.autoSwitch = false;
this.router.events this.router.events
.filter(event => event instanceof ActivationEnd) .filter(event => event instanceof ActivationStart)
.subscribe((event: ActivationEnd) => this.autoSwitch = !!event.snapshot.data.autoSwitchable); .subscribe((event: ActivationStart) => this.autoSwitch = !!event.snapshot.data.autoSwitchable);
this.slideIntervalSubscription = this.settings.slideIntervalChanged.subscribe( this.slideIntervalSubscription = this.settings.slideIntervalChanged.subscribe(
interval => this.setSlideTimer(interval) interval => this.setSlideTimer(interval)