aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+accounts/account-search/account-search.component.ts
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+accounts/account-search/account-search.component.ts')
-rw-r--r--client/src/app/+accounts/account-search/account-search.component.ts19
1 files changed, 10 insertions, 9 deletions
diff --git a/client/src/app/+accounts/account-search/account-search.component.ts b/client/src/app/+accounts/account-search/account-search.component.ts
index 378aa78c4..dda4bf0c7 100644
--- a/client/src/app/+accounts/account-search/account-search.component.ts
+++ b/client/src/app/+accounts/account-search/account-search.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'
@@ -16,6 +16,7 @@ import { VideoFilter } from '@shared/models'
16export class AccountSearchComponent extends AbstractVideoList implements OnInit, OnDestroy { 16export class AccountSearchComponent extends AbstractVideoList implements OnInit, OnDestroy {
17 titlePage: string 17 titlePage: string
18 loadOnInit = false 18 loadOnInit = false
19 loadUserVideoPreferences = true
19 20
20 search = '' 21 search = ''
21 filter: VideoFilter = null 22 filter: VideoFilter = null
@@ -46,14 +47,14 @@ export class AccountSearchComponent extends AbstractVideoList implements OnInit,
46 this.enableAllFilterIfPossible() 47 this.enableAllFilterIfPossible()
47 48
48 // Parent get the account for us 49 // Parent get the account for us
49 this.accountSub = this.accountService.accountLoaded 50 this.accountSub = forkJoin([
50 .pipe(first()) 51 this.accountService.accountLoaded.pipe(first()),
51 .subscribe(account => { 52 this.onUserLoadedSubject.pipe(first())
52 this.account = account 53 ]).subscribe(([ account ]) => {
53 54 this.account = account
54 this.reloadVideos() 55
55 this.generateSyndicationList() 56 this.reloadVideos()
56 }) 57 })
57 } 58 }
58 59
59 ngOnDestroy () { 60 ngOnDestroy () {