show no files found message

2 files changed, 13 insertions, 0 deletions

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e01a029bc97..48c990872d1 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1685,9 +1685,14 @@
 			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')) {
+					this.$el.find('#nofilterresults').removeClass('hidden').
+						find('p').text(t('files', 'No entries in this folder match \'{filter}\'', {filter:this._filter}));
+				}
 			} else {
 				this.$el.find('#filestable thead th').toggleClass('hidden', this.isEmpty);
 				this.$el.find('#emptycontent').toggleClass('hidden', !this.isEmpty);
+				this.$el.find('#nofilterresults').addClass('hidden');
 			}
 		},
 		/**
diff --git a/apps/files/js/search.js b/apps/files/js/search.js
index 73eccd06dcf..ec93b937690 100644
--- a/apps/files/js/search.js
+++ b/apps/files/js/search.js
@@ -40,11 +40,18 @@
 					result.mime = result.mime_type;
 				}
 			}
+			function hideNoFilterResults (){
+				var $nofilterresults = $('#nofilterresults');
+				if ( ! $nofilterresults.hasClass('hidden') ) {
+					$nofilterresults.addClass('hidden');
+				}
+			}
 
 			this.renderFolderResult = function($row, result) {
 				if (inFileList($row, result)) {
 					return null;
 				}
+				hideNoFilterResults();
 				/*render folder icon, show path beneath filename,
 				 show size and last modified date on the right */
 				this.updateLegacyMimetype(result);
@@ -61,6 +68,7 @@
 				if (inFileList($row, result)) {
 					return null;
 				}
+				hideNoFilterResults();
 				/*render preview icon, show path beneath filename,
 				 show size and last modified date on the right */
 				this.updateLegacyMimetype(result);