diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-01-12 22:48:25 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-01-12 22:48:25 +0100 |
| commit | d20a1bbdbfed2a5d64af2e4d8d839494f4a8d3d4 (patch) | |
| tree | 930a8da61f5cbcfa16ba31f1ce50954edc013364 /apps/files/js | |
| parent | ec70246be2cd2edb2bfb94e390eb18140b8522d5 (diff) | |
| parent | 45a20744fcdc0e3706b415fcf2b240afa4a0012e (diff) | |
| download | nextcloud-server-d20a1bbdbfed2a5d64af2e4d8d839494f4a8d3d4.tar.gz nextcloud-server-d20a1bbdbfed2a5d64af2e4d8d839494f4a8d3d4.zip | |
Merge pull request #13154 from owncloud/fix13141
don't show no files yet when mask is in place, fixes #13141
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/filelist.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index d6d5bcf912e..1d7252220bf 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,13 +1692,15 @@ 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}, null, {'escape': false})); } } else { this.$el.find('#filestable thead th').toggleClass('hidden', this.isEmpty); - this.$el.find('#emptycontent').toggleClass('hidden', !this.isEmpty); + if (!this.$el.find('.mask').exists()) { + this.$el.find('#emptycontent').toggleClass('hidden', !this.isEmpty); + } this.$el.find('.nofilterresults').addClass('hidden'); } }, |