X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Frouting%2Fpreload-selected-modules-list.ts;h=1abcdb01514c12df0a8ecceeca7ca76d04980802;hb=b1dbb9fefc870a90b25f5c0153589f45c9e75e3e;hp=8a458ec3ece2f979477f3776b78ec8e848b969cf;hpb=ec61fb7e2cbb3897fe29cb54ec3a1ec864163c91;p=github%2FChocobozzz%2FPeerTube.git

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..1abcdb015 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,16 @@
-import { Route, PreloadingStrategy } from '@angular/router'
-import { Observable } from 'rxjs/Observable'
-import 'rxjs/add/observable/timer'
-import 'rxjs/add/operator/switchMap'
+import { Observable, of as ofObservable, timer as observableTimer } from 'rxjs'
+import { switchMap } from 'rxjs/operators'
+import { Injectable } from '@angular/core'
+import { PreloadingStrategy, Route } from '@angular/router'
 
+@Injectable()
 export class PreloadSelectedModulesList implements PreloadingStrategy {
-  preload (route: Route, load: Function): Observable<any> {
-    if (!route.data || !route.data.preload) return Observable.of(null)
+
+  preload (route: Route, load: () => Observable<any>): Observable<any> {
+    if (!route.data?.preload) return ofObservable(null)
 
     if (typeof route.data.preload === 'number') {
-      return Observable.timer(route.data.preload).switchMap(() => load())
+      return observableTimer(route.data.preload).pipe(switchMap(() => load()))
     }
 
     return load()