From 58baf137aa5b24fa03dce94427d5954cee45e237 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 8 Dec 2018 10:47:22 -0500 Subject: [PATCH] dont apply old pipe search during select all filter --- jslib | 2 +- src/app/vault/ciphers.component.ts | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/jslib b/jslib index 5609fecbce..9283a29d35 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 5609fecbcee6d0608ea28985c31688511e735a59 +Subproject commit 9283a29d35a18f058f3c84f8aaa919b911f1940a diff --git a/src/app/vault/ciphers.component.ts b/src/app/vault/ciphers.component.ts index 32960bdc53..7fbabaad48 100644 --- a/src/app/vault/ciphers.component.ts +++ b/src/app/vault/ciphers.component.ts @@ -20,8 +20,6 @@ import { CipherType } from 'jslib/enums/cipherType'; import { CipherView } from 'jslib/models/view/cipherView'; -import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe'; - const MaxCheckedCount = 500; @Component({ @@ -37,13 +35,10 @@ export class CiphersComponent extends BaseCiphersComponent implements OnDestroy cipherType = CipherType; actionPromise: Promise; - private searchPipe: SearchCiphersPipe; - constructor(searchService: SearchService, protected analytics: Angulartics2, protected toasterService: ToasterService, protected i18nService: I18nService, protected platformUtilsService: PlatformUtilsService, protected cipherService: CipherService) { super(searchService); - this.searchPipe = new SearchCiphersPipe(platformUtilsService); } ngOnDestroy() { @@ -58,14 +53,9 @@ export class CiphersComponent extends BaseCiphersComponent implements OnDestroy if (select) { this.selectAll(false); } - let filteredCiphers = this.ciphers; - if (select) { - filteredCiphers = this.searchPipe.transform(this.ciphers, this.searchText); - } - const selectCount = select && filteredCiphers.length > MaxCheckedCount ? - MaxCheckedCount : filteredCiphers.length; + const selectCount = select && this.ciphers.length > MaxCheckedCount ? MaxCheckedCount : this.ciphers.length; for (let i = 0; i < selectCount; i++) { - this.checkCipher(filteredCiphers[i], select); + this.checkCipher(this.ciphers[i], select); } }