bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 16:53:34 +00:00
Code Issues Releases Wiki Activity

apply search state before reloading list

Browse Source
This commit is contained in:
Kyle Spearrin
2019-11-20 16:31:45 -05:00
parent 7d7b433f0b
commit 88b2746920
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

Submodule jslib updated: b3d1e9d233...57e49207e9

13
src/popup/vault/ciphers.component.ts
View File

@@ -72,6 +72,13 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
async ngOnInit() { async ngOnInit() {
this.searchTypeSearch = !this.platformUtilsService.isSafari(); this.searchTypeSearch = !this.platformUtilsService.isSafari();
const queryParamsSub = this.route.queryParams.subscribe(async (params) => { const queryParamsSub = this.route.queryParams.subscribe(async (params) => {
if (this.applySavedState) {
this.state = (await this.stateService.get<any>(ComponentId)) || {};
if (this.state.searchText) {
this.searchText = this.state.searchText;
}
}
if (params.type) { if (params.type) {
this.searchPlaceholder = this.i18nService.t('searchType'); this.searchPlaceholder = this.i18nService.t('searchType');
this.type = parseInt(params.type, null); this.type = parseInt(params.type, null);
@@ -121,11 +128,7 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
await this.load(); await this.load();
} }
if (this.applySavedState) { if (this.applySavedState && this.state != null) {
this.state = (await this.stateService.get<any>(ComponentId)) || {};
if (this.state.searchText) {
this.searchText = this.state.searchText;
}
window.setTimeout(() => this.popupUtils.setContentScrollY(window, this.state.scrollY), 0); window.setTimeout(() => this.popupUtils.setContentScrollY(window, this.state.scrollY), 0);
} }
this.stateService.remove(ComponentId); this.stateService.remove(ComponentId);