aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+accounts/account-videos/account-videos.component.ts
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+accounts/account-videos/account-videos.component.ts')
-rw-r--r--client/src/app/+accounts/account-videos/account-videos.component.ts18
1 files changed, 10 insertions, 8 deletions
diff --git a/client/src/app/+accounts/account-videos/account-videos.component.ts b/client/src/app/+accounts/account-videos/account-videos.component.ts
index da3903d2c..484d60e25 100644
--- a/client/src/app/+accounts/account-videos/account-videos.component.ts
+++ b/client/src/app/+accounts/account-videos/account-videos.component.ts
@@ -1,4 +1,4 @@
1import { Subscription } from 'rxjs' 1import { forkJoin, Subscription } from 'rxjs'
2import { first, tap } from 'rxjs/operators' 2import { first, tap } from 'rxjs/operators'
3import { Component, ComponentFactoryResolver, OnDestroy, OnInit } from '@angular/core' 3import { Component, ComponentFactoryResolver, OnDestroy, OnInit } from '@angular/core'
4import { ActivatedRoute, Router } from '@angular/router' 4import { ActivatedRoute, Router } from '@angular/router'
@@ -18,6 +18,7 @@ import { VideoFilter } from '@shared/models'
18export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { 18export class AccountVideosComponent 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
@@ -47,14 +48,15 @@ export class AccountVideosComponent extends AbstractVideoList implements OnInit,
47 this.enableAllFilterIfPossible() 48 this.enableAllFilterIfPossible()
48 49
49 // Parent get the account for us 50 // Parent get the account for us
50 this.accountSub = this.accountService.accountLoaded 51 this.accountSub = forkJoin([
51 .pipe(first()) 52 this.accountService.accountLoaded.pipe(first()),
52 .subscribe(account => { 53 this.onUserLoadedSubject.pipe(first())
53 this.account = account 54 ]).subscribe(([ account ]) => {
55 this.account = account
54 56
55 this.reloadVideos() 57 this.reloadVideos()
56 this.generateSyndicationList() 58 this.generateSyndicationList()
57 }) 59 })
58 } 60 }
59 61
60 ngOnDestroy () { 62 ngOnDestroy () {