diff options
Diffstat (limited to 'client/src')
3 files changed, 4 insertions, 4 deletions
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 { | |||
39 | 39 | ||
40 | const scrollObservable = fromEvent(this.container || window, 'scroll') | 40 | const scrollObservable = fromEvent(this.container || window, 'scroll') |
41 | .pipe( | 41 | .pipe( |
42 | startWith(null), | 42 | startWith(null as string), // FIXME: typings |
43 | throttleTime(200, undefined, throttleOptions), | 43 | throttleTime(200, undefined, throttleOptions), |
44 | map(() => this.getScrollInfo()), | 44 | map(() => this.getScrollInfo()), |
45 | distinctUntilChanged((o1, o2) => o1.current === o2.current), | 45 | 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 @@ | |||
31 | 31 | ||
32 | <div class="video-info-privacy"> | 32 | <div class="video-info-privacy"> |
33 | <ng-container *ngIf="displayOptions.privacyText">{{ video.privacy.label }}</ng-container> | 33 | <ng-container *ngIf="displayOptions.privacyText">{{ video.privacy.label }}</ng-container> |
34 | <ng-container *ngIf="displayOptions.privacyText && displayOptions.state"> - </ng-container> | 34 | <ng-container *ngIf="displayOptions.privacyText && getStateLabel(video)"> - </ng-container> |
35 | <ng-container *ngIf="displayOptions.state">{{ getStateLabel(video) }}</ng-container> | 35 | <ng-container *ngIf="displayOptions.state">{{ getStateLabel(video) }}</ng-container> |
36 | </div> | 36 | </div> |
37 | 37 | ||
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 { | |||
255 | ) | 255 | ) |
256 | 256 | ||
257 | // Video did change | 257 | // Video did change |
258 | forkJoin( | 258 | forkJoin([ |
259 | videoObs, | 259 | videoObs, |
260 | this.videoCaptionService.listCaptions(videoId) | 260 | this.videoCaptionService.listCaptions(videoId) |
261 | ) | 261 | ]) |
262 | .pipe( | 262 | .pipe( |
263 | // If 401, the video is private or blacklisted so redirect to 404 | 263 | // If 401, the video is private or blacklisted so redirect to 404 |
264 | catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ])) | 264 | catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ])) |