diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2016-07-01 18:31:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 18:31:51 +0200 |
| commit | 5b4cea4b366e9420a70cad4b817c1594da2ad0fe (patch) | |
| tree | 56ae6180e876296b45e512d8184b8fc7fd08192e /apps/files/js | |
| parent | 1d96fc9f78f7619995ab803f40395fb1a9accd7e (diff) | |
| parent | 179a355b2cd3dc489a54cc27fd717f67373d0b1e (diff) | |
| download | nextcloud-server-5b4cea4b366e9420a70cad4b817c1594da2ad0fe.tar.gz nextcloud-server-5b4cea4b366e9420a70cad4b817c1594da2ad0fe.zip | |
Merge pull request #275 from nextcloud/master-sync-upstream
[Master] Sync upstream
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/filelist.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 0813d2cc30e..593f182cf73 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2352,13 +2352,16 @@ */ setFilter:function(filter) { var total = 0; + if (this._filter === filter) { + return; + } this._filter = filter; this.fileSummary.setFilter(filter, this.files); total = this.fileSummary.getTotal(); if (!this.$el.find('.mask').exists()) { this.hideIrrelevantUIWhenNoFilesMatch(); } - var that = this; + var visibleCount = 0; filter = filter.toLowerCase(); @@ -2378,7 +2381,7 @@ if (visibleCount < total) { $trs = this._nextPage(false); } - } while (visibleCount < total); + } while (visibleCount < total && $trs.length > 0); this.$container.trigger('scroll'); }, |