devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

apply search state before reloading list

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit b3d1e9d233aa7ed235d6ec0b26cdba41afa065ae
Subproject commit 57e49207e9ad57c71576fc487a38513a4d0fe120

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

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