summaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2015-01-09 10:49:22 +0100
committerJörn Friedrich Dreyer <jfd@butonic.de>2015-01-09 10:49:22 +0100
commit45a20744fcdc0e3706b415fcf2b240afa4a0012e (patch)
tree97ed4a1c581f9cfa4bff0663fad3058504dc5129 /apps/files/js
parent0bb91cfcf3d0f25ab4962c1417206451bebdb978 (diff)
downloadnextcloud-server-45a20744fcdc0e3706b415fcf2b240afa4a0012e.tar.gz
nextcloud-server-45a20744fcdc0e3706b415fcf2b240afa4a0012e.zip
add js tests for filelist filtering
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/filelist.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 80f9d9c30c3..0476cd166a0 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1674,7 +1674,9 @@
setFilter:function(filter) {
this._filter = filter;
this.fileSummary.setFilter(filter, this.files);
- this.hideIrrelevantUIWhenNoFilesMatch();
+ if (!this.$el.find('.mask').exists()) {
+ this.hideIrrelevantUIWhenNoFilesMatch();
+ }
var that = this;
this.$fileList.find('tr').each(function(i,e) {
var $e = $(e);
@@ -1690,7 +1692,7 @@
if (this._filter && this.fileSummary.summary.totalDirs + this.fileSummary.summary.totalFiles === 0) {
this.$el.find('#filestable thead th').addClass('hidden');
this.$el.find('#emptycontent').addClass('hidden');
- if ( $('#searchresults').length === 0 || $('#searchresults').hasClass('hidden')) {
+ if ( $('#searchresults').length === 0 || $('#searchresults').hasClass('hidden') ) {
this.$el.find('.nofilterresults').removeClass('hidden').
find('p').text(t('files', "No entries in this folder match '{filter}'", {filter:this._filter}));
}