]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #13154 from owncloud/fix13141
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 12 Jan 2015 21:48:25 +0000 (22:48 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 12 Jan 2015 21:48:25 +0000 (22:48 +0100)
don't show no files yet when mask is in place, fixes #13141

1  2 
apps/files/js/filelist.js

index d6d5bcf912e0df1bf020dfd0b30d2641934fa0a2,0476cd166a03b9d71e00e43b98c059b09c5f3d80..1d7252220bf57343983a6e53cfc969d28b6333cf
                        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}));
 +                                              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);