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

ref ciphers paging from jslib

Browse Source
This commit is contained in:
Kyle Spearrin
2019-03-19 11:34:34 -04:00
parent 44a98bb1bc
commit eb07b1b080
5 changed files with 8 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/popup/vault/ciphers.component.html
View File

@@ -53,7 +53,7 @@
</div>
</div>
</ng-container>
<ng-container *ngIf="(!isPaging() ? ciphers : pagedCiphers) as filteredCiphers">
<ng-container *ngIf="(isPaging() ? pagedCiphers : ciphers) as filteredCiphers">
<div class="no-items" *ngIf="!filteredCiphers.length">
<i class="fa fa-spinner fa-spin fa-3x" *ngIf="!loaded"></i>
<ng-container *ngIf="loaded">
@@ -63,7 +63,7 @@
</button>
</ng-container>
</div>
<div class="box list only-list" *ngIf="filteredCiphers.length > 0" infiniteScroll [infiniteScrollDistance]="1"
<div class="box list only-list" *ngIf="filteredCiphers.length" infiniteScroll [infiniteScrollDistance]="1"
[infiniteScrollContainer]="'content'" [fromRoot]="true" [infiniteScrollDisabled]="!isPaging()"
(scrolled)="loadMore()">
<div class="box-header">

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

@@ -48,15 +48,12 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
folderId: string = null;
collectionId: string = null;
type: CipherType = null;
pagedCiphers: CipherView[] = [];
nestedFolders: Array<TreeNode<FolderView>>;
nestedCollections: Array<TreeNode<CollectionView>>;
searchTypeSearch = false;
private didScroll = false;
private selectedTimeout: number;
private preventSelected = false;
private pageSize = 100;
private applySavedState = true;
constructor(searchService: SearchService, private route: ActivatedRoute,
@@ -67,7 +64,7 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
private folderService: FolderService, private collectionService: CollectionService,
private analytics: Angulartics2, private platformUtilsService: PlatformUtilsService) {
super(searchService);
this.pageSize = platformUtilsService.isEdge() ? 25 : 100;
this.pageSize = platformUtilsService.isEdge() ? 25 : 10;
this.applySavedState = (window as any).previousPopupUrl != null &&
!(window as any).previousPopupUrl.startsWith('/ciphers');
}
@@ -124,7 +121,6 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
await this.load();
}
this.loadMore();
if (this.applySavedState) {
this.state = (await this.stateService.get<any>(ComponentId)) || {};
if (this.state.searchText) {
@@ -214,41 +210,12 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
this.location.back();
}
loadMore() {
if (this.ciphers.length <= this.pageSize) {
return;
}
const pagedLength = this.pagedCiphers.length;
if (this.ciphers.length > pagedLength) {
this.pagedCiphers = this.pagedCiphers.concat(this.ciphers.slice(pagedLength, pagedLength + this.pageSize));
}
this.didScroll = this.pagedCiphers.length > this.pageSize;
}
showGroupings() {
return !this.isSearching() &&
((this.nestedFolders && this.nestedFolders.length) ||
(this.nestedCollections && this.nestedCollections.length));
}
isSearching() {
return !this.searchPending && this.searchService.isSearchable(this.searchText);
}
isPaging() {
const searching = this.isSearching();
if (searching && this.didScroll) {
this.resetPaging();
}
return !searching && this.ciphers.length > this.pageSize;
}
async resetPaging() {
this.pagedCiphers = [];
this.loadMore();
}
private async saveState() {
this.state = {
scrollY: this.popupUtils.getContentScrollY(window),