diff options
Diffstat (limited to 'client/src/app/+search')
-rw-r--r-- | client/src/app/+search/search-routing.module.ts | 4 | ||||
-rw-r--r-- | client/src/app/+search/search.component.ts | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/client/src/app/+search/search-routing.module.ts b/client/src/app/+search/search-routing.module.ts index e5d7d1ede..0d778af0d 100644 --- a/client/src/app/+search/search-routing.module.ts +++ b/client/src/app/+search/search-routing.module.ts | |||
@@ -1,6 +1,5 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { RouterModule, Routes } from '@angular/router' | 2 | import { RouterModule, Routes } from '@angular/router' |
3 | import { MetaGuard } from '@ngx-meta/core' | ||
4 | import { ChannelLazyLoadResolver } from './channel-lazy-load.resolver' | 3 | import { ChannelLazyLoadResolver } from './channel-lazy-load.resolver' |
5 | import { SearchComponent } from './search.component' | 4 | import { SearchComponent } from './search.component' |
6 | import { VideoLazyLoadResolver } from './video-lazy-load.resolver' | 5 | import { VideoLazyLoadResolver } from './video-lazy-load.resolver' |
@@ -9,7 +8,6 @@ const searchRoutes: Routes = [ | |||
9 | { | 8 | { |
10 | path: '', | 9 | path: '', |
11 | component: SearchComponent, | 10 | component: SearchComponent, |
12 | canActivate: [ MetaGuard ], | ||
13 | data: { | 11 | data: { |
14 | meta: { | 12 | meta: { |
15 | title: $localize`Search` | 13 | title: $localize`Search` |
@@ -19,7 +17,6 @@ const searchRoutes: Routes = [ | |||
19 | { | 17 | { |
20 | path: 'lazy-load-video', | 18 | path: 'lazy-load-video', |
21 | component: SearchComponent, | 19 | component: SearchComponent, |
22 | canActivate: [ MetaGuard ], | ||
23 | resolve: { | 20 | resolve: { |
24 | data: VideoLazyLoadResolver | 21 | data: VideoLazyLoadResolver |
25 | } | 22 | } |
@@ -27,7 +24,6 @@ const searchRoutes: Routes = [ | |||
27 | { | 24 | { |
28 | path: 'lazy-load-channel', | 25 | path: 'lazy-load-channel', |
29 | component: SearchComponent, | 26 | component: SearchComponent, |
30 | canActivate: [ MetaGuard ], | ||
31 | resolve: { | 27 | resolve: { |
32 | data: ChannelLazyLoadResolver | 28 | data: ChannelLazyLoadResolver |
33 | } | 29 | } |
diff --git a/client/src/app/+search/search.component.ts b/client/src/app/+search/search.component.ts index ecede19a3..dcf654b7a 100644 --- a/client/src/app/+search/search.component.ts +++ b/client/src/app/+search/search.component.ts | |||
@@ -1,12 +1,11 @@ | |||
1 | import { forkJoin, of, Subscription } from 'rxjs' | 1 | import { forkJoin, of, Subscription } from 'rxjs' |
2 | import { Component, OnDestroy, OnInit } from '@angular/core' | 2 | import { Component, OnDestroy, OnInit } from '@angular/core' |
3 | import { ActivatedRoute, Router } from '@angular/router' | 3 | import { ActivatedRoute, Router } from '@angular/router' |
4 | import { AuthService, ComponentPagination, HooksService, Notifier, ServerService, User, UserService } from '@app/core' | 4 | import { AuthService, ComponentPagination, HooksService, MetaService, Notifier, ServerService, User, UserService } from '@app/core' |
5 | import { immutableAssign } from '@app/helpers' | 5 | import { immutableAssign } from '@app/helpers' |
6 | import { Video, VideoChannel } from '@app/shared/shared-main' | 6 | import { Video, VideoChannel } from '@app/shared/shared-main' |
7 | import { AdvancedSearch, SearchService } from '@app/shared/shared-search' | 7 | import { AdvancedSearch, SearchService } from '@app/shared/shared-search' |
8 | import { MiniatureDisplayOptions, VideoLinkType } from '@app/shared/shared-video-miniature' | 8 | import { MiniatureDisplayOptions, VideoLinkType } from '@app/shared/shared-video-miniature' |
9 | import { MetaService } from '@ngx-meta/core' | ||
10 | import { SearchTargetType, ServerConfig } from '@shared/models' | 9 | import { SearchTargetType, ServerConfig } from '@shared/models' |
11 | 10 | ||
12 | @Component({ | 11 | @Component({ |
@@ -238,7 +237,10 @@ export class SearchComponent implements OnInit, OnDestroy { | |||
238 | } | 237 | } |
239 | 238 | ||
240 | private updateTitle () { | 239 | private updateTitle () { |
241 | const suffix = this.currentSearch ? ' ' + this.currentSearch : '' | 240 | const suffix = this.currentSearch |
241 | ? ' ' + this.currentSearch | ||
242 | : '' | ||
243 | |||
242 | this.metaService.setTitle($localize`Search` + suffix) | 244 | this.metaService.setTitle($localize`Search` + suffix) |
243 | } | 245 | } |
244 | 246 | ||