From c8861d5dc0436ef4342ce517241e3591fa256a13 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 25 Jul 2019 16:23:44 +0200
Subject: Fix express validator

---
 client/src/app/shared/video/infinite-scroller.directive.ts  | 2 +-
 client/src/app/shared/video/video-miniature.component.html  | 2 +-
 client/src/app/videos/+video-watch/video-watch.component.ts | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'client')

diff --git a/client/src/app/shared/video/infinite-scroller.directive.ts b/client/src/app/shared/video/infinite-scroller.directive.ts
index 5f8a1dd6e..b1e88882c 100644
--- a/client/src/app/shared/video/infinite-scroller.directive.ts
+++ b/client/src/app/shared/video/infinite-scroller.directive.ts
@@ -39,7 +39,7 @@ export class InfiniteScrollerDirective implements OnInit, OnDestroy {
 
     const scrollObservable = fromEvent(this.container || window, 'scroll')
       .pipe(
-        startWith(null),
+        startWith(null as string), // FIXME: typings
         throttleTime(200, undefined, throttleOptions),
         map(() => this.getScrollInfo()),
         distinctUntilChanged((o1, o2) => o1.current === o2.current),
diff --git a/client/src/app/shared/video/video-miniature.component.html b/client/src/app/shared/video/video-miniature.component.html
index 7af0f1113..51ca1393d 100644
--- a/client/src/app/shared/video/video-miniature.component.html
+++ b/client/src/app/shared/video/video-miniature.component.html
@@ -31,7 +31,7 @@
 
       <div class="video-info-privacy">
         <ng-container *ngIf="displayOptions.privacyText">{{ video.privacy.label }}</ng-container>
-        <ng-container *ngIf="displayOptions.privacyText && displayOptions.state"> - </ng-container>
+        <ng-container *ngIf="displayOptions.privacyText && getStateLabel(video)"> - </ng-container>
         <ng-container *ngIf="displayOptions.state">{{ getStateLabel(video) }}</ng-container>
       </div>
 
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index 027c2b026..0d499d47f 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -255,10 +255,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     )
 
     // Video did change
-    forkJoin(
+    forkJoin([
       videoObs,
       this.videoCaptionService.listCaptions(videoId)
-    )
+    ])
       .pipe(
         // If 401, the video is private or blacklisted so redirect to 404
         catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ]))
-- 
cgit v1.2.3