From 489290b8b16bede6ddfb773adad55dee6471ccfd Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 21 Mar 2019 16:49:46 +0100 Subject: Restore videos list components --- .../src/app/+accounts/account-videos/account-videos.component.ts | 9 +++------ client/src/app/+accounts/accounts-routing.module.ts | 4 ++++ 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'client/src/app/+accounts') 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 13b634a01..7535eef08 100644 --- a/client/src/app/+accounts/account-videos/account-videos.component.ts +++ b/client/src/app/+accounts/account-videos/account-videos.component.ts @@ -1,6 +1,5 @@ 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 { AuthService } from '../../core/auth' import { ConfirmService } from '../../core/confirm' @@ -12,7 +11,7 @@ import { 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 } from '@app/core' +import { Notifier, ServerService } from '@app/core' @Component({ selector: 'my-account-videos', @@ -25,7 +24,6 @@ import { Notifier } from '@app/core' export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { titlePage: string marginContent = false // Disable margin - currentRoute = '/accounts/videos' loadOnInit = false private account: Account @@ -33,13 +31,13 @@ export class AccountVideosComponent extends AbstractVideoList implements OnInit, constructor ( protected router: Router, + protected serverService: ServerService, protected route: ActivatedRoute, protected authService: AuthService, protected notifier: Notifier, protected confirmService: ConfirmService, - protected location: Location, protected screenService: ScreenService, - protected i18n: I18n, + private i18n: I18n, private accountService: AccountService, private videoService: VideoService ) { @@ -55,7 +53,6 @@ export class AccountVideosComponent extends AbstractVideoList implements OnInit, this.accountSub = this.accountService.accountLoaded .subscribe(account => { this.account = account - this.currentRoute = '/accounts/' + this.account.nameWithHost + '/videos' this.reloadVideos() this.generateSyndicationList() diff --git a/client/src/app/+accounts/accounts-routing.module.ts b/client/src/app/+accounts/accounts-routing.module.ts index ffe606b43..531d763c4 100644 --- a/client/src/app/+accounts/accounts-routing.module.ts +++ b/client/src/app/+accounts/accounts-routing.module.ts @@ -23,6 +23,10 @@ const accountsRoutes: Routes = [ data: { meta: { title: 'Account videos' + }, + reuse: { + enabled: true, + key: 'account-videos-list' } } }, -- cgit v1.2.3