diff options
Diffstat (limited to 'client/src/app/+video-channels')
-rw-r--r-- | client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts index a49fd0d5d..803651505 100644 --- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts +++ b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Subscription } from 'rxjs' | 1 | import { forkJoin, Subscription } from 'rxjs' |
2 | import { first, tap } from 'rxjs/operators' | 2 | import { first, tap } from 'rxjs/operators' |
3 | import { Component, ComponentFactoryResolver, OnDestroy, OnInit } from '@angular/core' | 3 | import { Component, ComponentFactoryResolver, OnDestroy, OnInit } from '@angular/core' |
4 | import { ActivatedRoute, Router } from '@angular/router' | 4 | import { ActivatedRoute, Router } from '@angular/router' |
@@ -18,6 +18,7 @@ import { VideoFilter } from '@shared/models' | |||
18 | export class VideoChannelVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { | 18 | export class VideoChannelVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { |
19 | titlePage: string | 19 | titlePage: string |
20 | loadOnInit = false | 20 | loadOnInit = false |
21 | loadUserVideoPreferences = true | ||
21 | 22 | ||
22 | filter: VideoFilter = null | 23 | filter: VideoFilter = null |
23 | 24 | ||
@@ -53,14 +54,15 @@ export class VideoChannelVideosComponent extends AbstractVideoList implements On | |||
53 | this.enableAllFilterIfPossible() | 54 | this.enableAllFilterIfPossible() |
54 | 55 | ||
55 | // Parent get the video channel for us | 56 | // Parent get the video channel for us |
56 | this.videoChannelSub = this.videoChannelService.videoChannelLoaded | 57 | this.videoChannelSub = forkJoin([ |
57 | .pipe(first()) | 58 | this.videoChannelService.videoChannelLoaded.pipe(first()), |
58 | .subscribe(videoChannel => { | 59 | this.onUserLoadedSubject.pipe(first()) |
59 | this.videoChannel = videoChannel | 60 | ]).subscribe(([ videoChannel ]) => { |
60 | 61 | this.videoChannel = videoChannel | |
61 | this.reloadVideos() | 62 | |
62 | this.generateSyndicationList() | 63 | this.reloadVideos() |
63 | }) | 64 | this.generateSyndicationList() |
65 | }) | ||
64 | } | 66 | } |
65 | 67 | ||
66 | ngOnDestroy () { | 68 | ngOnDestroy () { |