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

popup search service to avoid background page marshalling

Browse Source
This commit is contained in:
Kyle Spearrin
2018-08-16 23:33:07 -04:00
parent 08aadcb032
commit d56dfab2fe
4 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/popup/vault/groupings.component.ts
View File

@@ -62,6 +62,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
private searchTimeout: any = null;
private hasSearched = false;
private hasLoadedAllCiphers = false;
private allCiphers: CipherView[] = null;
constructor(collectionService: CollectionService, folderService: FolderService,
private cipherService: CipherService, private router: Router,
@@ -154,6 +155,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
}
async loadCiphers() {
this.allCiphers = await this.cipherService.getAllDecrypted();
if (!this.hasLoadedAllCiphers) {
this.hasLoadedAllCiphers = !this.searchService.isSearchable(this.searchText);
}
@@ -216,7 +218,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
}
if (timeout == null) {
this.hasSearched = this.searchService.isSearchable(this.searchText);
this.ciphers = await this.searchService.searchCiphers(this.searchText, null);
this.ciphers = await this.searchService.searchCiphers(this.searchText, null, this.allCiphers);
return;
}
this.searchPending = true;
@@ -225,7 +227,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
if (!this.hasLoadedAllCiphers && !this.hasSearched) {
await this.loadCiphers();
} else {
this.ciphers = await this.searchService.searchCiphers(this.searchText, null);
this.ciphers = await this.searchService.searchCiphers(this.searchText, null, this.allCiphers);
}
this.searchPending = false;
}, timeout);