X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Baccounts%2Faccount-videos%2Faccount-videos.component.ts;h=5a99aadcee5c876e5a8e268dc5ad1434f3ede06e;hb=34c7f429e411fb911dfa56a816b638fd665717a4;hp=5e3dbb6b386921d161aebe2a46e990347f443b53;hpb=734a5ceb3d04088743d72babcb9b05e6142043f6;p=github%2FChocobozzz%2FPeerTube.git 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 5e3dbb6b3..5a99aadce 100644 --- a/client/src/app/+accounts/account-videos/account-videos.component.ts +++ b/client/src/app/+accounts/account-videos/account-videos.component.ts @@ -1,17 +1,17 @@ import { Component, OnDestroy, OnInit } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' -import { Location } from '@angular/common' import { immutableAssign } from '@app/shared/misc/utils' -import { NotificationsService } from 'angular2-notifications' import { AuthService } from '../../core/auth' import { ConfirmService } from '../../core/confirm' import { AbstractVideoList } from '../../shared/video/abstract-video-list' import { VideoService } from '../../shared/video/video.service' import { Account } from '@app/shared/account/account.model' import { AccountService } from '@app/shared/account/account.service' -import { tap } from 'rxjs/operators' +import { first, tap } from 'rxjs/operators' import { I18n } from '@ngx-translate/i18n-polyfill' import { Subscription } from 'rxjs' +import { ScreenService } from '@app/shared/misc/screen.service' +import { Notifier, ServerService } from '@app/core' @Component({ selector: 'my-account-videos', @@ -23,27 +23,24 @@ import { Subscription } from 'rxjs' }) export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { titlePage: string - marginContent = false // Disable margin - currentRoute = '/account/videos' loadOnInit = false private account: Account private accountSub: Subscription constructor ( + protected i18n: I18n, protected router: Router, + protected serverService: ServerService, protected route: ActivatedRoute, protected authService: AuthService, - protected notificationsService: NotificationsService, + protected notifier: Notifier, protected confirmService: ConfirmService, - protected location: Location, - protected i18n: I18n, + protected screenService: ScreenService, private accountService: AccountService, private videoService: VideoService ) { super() - - this.titlePage = this.i18n('Published videos') } ngOnInit () { @@ -51,13 +48,13 @@ export class AccountVideosComponent extends AbstractVideoList implements OnInit, // Parent get the account for us this.accountSub = this.accountService.accountLoaded - .subscribe(account => { - this.account = account - this.currentRoute = '/account/' + this.account.nameWithHost + '/videos' + .pipe(first()) + .subscribe(account => { + this.account = account - this.reloadVideos() - this.generateSyndicationList() - }) + this.reloadVideos() + this.generateSyndicationList() + }) } ngOnDestroy () {