summaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-11-16 19:10:35 +0100
committerGitHub <noreply@github.com>2016-11-16 19:10:35 +0100
commit8f38adaab19053622d54f8cd55f4a8ba97b59cef (patch)
tree93025cc79f27bcdd1c1fc4ccc7011d6049ccdfac /apps/files/js
parentcc8750ca30ba5d13ca59cc8c3ce87122a451829a (diff)
parent1141fcc9ac1dfd80deeef66e82ee2c8968bdce4d (diff)
downloadnextcloud-server-8f38adaab19053622d54f8cd55f4a8ba97b59cef.tar.gz
nextcloud-server-8f38adaab19053622d54f8cd55f4a8ba97b59cef.zip
Merge pull request #2123 from nextcloud/downstream-26522
Skip hidden files when counting visible files in list
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/filelist.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index c53fa4f3d66..d32c3ba7c9e 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -923,7 +923,8 @@
tr,
fileData,
newTrs = [],
- isAllSelected = this.isAllSelected();
+ isAllSelected = this.isAllSelected(),
+ showHidden = this._filesConfig.get('showhidden');
if (index >= this.files.length) {
return false;
@@ -947,7 +948,10 @@
}
newTrs.push(tr);
index++;
- count--;
+ // only count visible rows
+ if (showHidden || !tr.hasClass('hidden-file')) {
+ count--;
+ }
}
// trigger event for newly added rows