From 45033eb81e748f73c6d6d0845d092253e1fe9497 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 11 Apr 2018 10:34:39 -0400
Subject: [PATCH] make paging smarter

---
 src/popup/vault/ciphers.component.html |  4 ++--
 src/popup/vault/ciphers.component.ts   | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/popup/vault/ciphers.component.html b/src/popup/vault/ciphers.component.html
index d3e12adf28..24f8568154 100644
--- a/src/popup/vault/ciphers.component.html
+++ b/src/popup/vault/ciphers.component.html
@@ -17,7 +17,7 @@
     </div>
 </header>
 <content>
-    <ng-container *ngIf="(isSearching() ? (ciphers | searchCiphers: searchText) : pagedCiphers) as filteredCiphers">
+    <ng-container *ngIf="(!isPaging() ? (ciphers | searchCiphers: searchText) : pagedCiphers) 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">
@@ -29,7 +29,7 @@
         </div>
         <div class="box list only-list" *ngIf="filteredCiphers.length > 0"
              infiniteScroll [infiniteScrollDistance]="1" [infiniteScrollContainer]="'content'" [fromRoot]="true"
-             [infiniteScrollDisabled]="isSearching()" (scrolled)="loadMore()">
+             [infiniteScrollDisabled]="!isPaging()" (scrolled)="loadMore()">
             <div class="box-header">
                 {{groupingTitle}}
                 <span class="flex-right">{{isSearching() ? filteredCiphers.length : ciphers.length}}</span>
diff --git a/src/popup/vault/ciphers.component.ts b/src/popup/vault/ciphers.component.ts
index 5659eb79e6..b27c5f8e78 100644
--- a/src/popup/vault/ciphers.component.ts
+++ b/src/popup/vault/ciphers.component.ts
@@ -174,6 +174,10 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
     }
 
     loadMore() {
+        if (this.ciphers.length <= PageSize) {
+            return;
+        }
+
         const pagedLength = this.pagedCiphers.length;
         if (this.ciphers.length > pagedLength) {
             this.pagedCiphers = this.pagedCiphers.concat(this.ciphers.slice(pagedLength, pagedLength + PageSize));
@@ -182,11 +186,15 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
     }
 
     isSearching() {
-        const searching = this.searchText != null && this.searchText.length > 1;
+        return this.searchText != null && this.searchText.length > 1;
+    }
+
+    isPaging() {
+        const searching = this.isSearching();
         if (searching && this.didScroll) {
             this.resetPaging();
         }
-        return searching;
+        return !searching && this.ciphers.length > PageSize;
     }
 
     async resetPaging() {