X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fheader%2Fsearch-typeahead.component.ts;h=2bf1072f443b1ce9752e80b0e5292e818a5fd56e;hb=140ea386dea49220f4cdd5b67027e8d30eee1b06;hp=d0350368dab790bd80ff089e1b84a32ae0b101e4;hpb=be6343d26ec07fd792de069229bd3be27e72d129;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/header/search-typeahead.component.ts b/client/src/app/header/search-typeahead.component.ts index d0350368d..2bf1072f4 100644 --- a/client/src/app/header/search-typeahead.component.ts +++ b/client/src/app/header/search-typeahead.component.ts @@ -36,7 +36,7 @@ export class SearchTypeaheadComponent implements OnInit, OnDestroy { ngOnInit () { this.route.queryParams - .pipe(first(params => params.search !== undefined && params.search !== null)) + .pipe(first(params => this.isOnSearch() && params.search !== undefined && params.search !== null)) .subscribe(params => this.search = params.search) this.serverService.getConfig() .subscribe(config => this.serverConfig = config) @@ -146,11 +146,15 @@ export class SearchTypeaheadComponent implements OnInit, OnDestroy { } } + isOnSearch () { + return window.location.pathname === '/search' + } + doSearch () { this.newSearch = false const queryParams: Params = {} - if (window.location.pathname === '/search' && this.route.snapshot.queryParams) { + if (this.isOnSearch() && this.route.snapshot.queryParams) { Object.assign(queryParams, this.route.snapshot.queryParams) }