diff options
author | Chocobozzz <me@florianbigard.com> | 2018-05-15 11:55:51 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-05-16 09:42:54 +0200 |
commit | db400f447a9f7aae1c56fa25396e93069744483f (patch) | |
tree | f45af832a5d3f4eebafd2f885b7413d9f84fa374 /client/src/app/core/routing | |
parent | 54c3a22faa04bf13eea37f39be9149fc5eb95737 (diff) | |
download | PeerTube-db400f447a9f7aae1c56fa25396e93069744483f.tar.gz PeerTube-db400f447a9f7aae1c56fa25396e93069744483f.tar.zst PeerTube-db400f447a9f7aae1c56fa25396e93069744483f.zip |
Upgrade to rxjs 6
Diffstat (limited to 'client/src/app/core/routing')
-rw-r--r-- | client/src/app/core/routing/preload-selected-modules-list.ts | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/client/src/app/core/routing/preload-selected-modules-list.ts b/client/src/app/core/routing/preload-selected-modules-list.ts index 8a458ec3e..3bca60317 100644 --- a/client/src/app/core/routing/preload-selected-modules-list.ts +++ b/client/src/app/core/routing/preload-selected-modules-list.ts | |||
@@ -1,14 +1,13 @@ | |||
1 | import { Route, PreloadingStrategy } from '@angular/router' | 1 | import { Observable, timer as observableTimer, of as ofObservable } from 'rxjs' |
2 | import { Observable } from 'rxjs/Observable' | 2 | import { switchMap } from 'rxjs/operators' |
3 | import 'rxjs/add/observable/timer' | 3 | import { PreloadingStrategy, Route } from '@angular/router' |
4 | import 'rxjs/add/operator/switchMap' | ||
5 | 4 | ||
6 | export class PreloadSelectedModulesList implements PreloadingStrategy { | 5 | export class PreloadSelectedModulesList implements PreloadingStrategy { |
7 | preload (route: Route, load: Function): Observable<any> { | 6 | preload (route: Route, load: Function): Observable<any> { |
8 | if (!route.data || !route.data.preload) return Observable.of(null) | 7 | if (!route.data || !route.data.preload) return ofObservable(null) |
9 | 8 | ||
10 | if (typeof route.data.preload === 'number') { | 9 | if (typeof route.data.preload === 'number') { |
11 | return Observable.timer(route.data.preload).switchMap(() => load()) | 10 | return observableTimer(route.data.preload).pipe(switchMap(() => load())) |
12 | } | 11 | } |
13 | 12 | ||
14 | return load() | 13 | return load() |