diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-07-01 11:36:35 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-07-01 11:36:35 +0200 |
| commit | 179a355b2cd3dc489a54cc27fd717f67373d0b1e (patch) | |
| tree | f87a5586086635d4cbd18771b442ee771f79e441 /apps/files/js | |
| parent | 8e002b61554308cb4d50570f715303a82136f0fa (diff) | |
| parent | 2d2d2267f7f38ca29e7b87f40fae62261614b0d1 (diff) | |
| download | nextcloud-server-179a355b2cd3dc489a54cc27fd717f67373d0b1e.tar.gz nextcloud-server-179a355b2cd3dc489a54cc27fd717f67373d0b1e.zip | |
Merge remote-tracking branch 'upstream/master' into 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 e483882fcc5..0d00362ba71 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'); }, |