From bf3ee69d8612a9f6df730ea5e28175317a24fe23 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 24 Jun 2016 11:31:29 +0200 Subject: Fix search result link for file results outside default list When outside the "All files" list, the search result link must properly redirect to the "All files" list. --- apps/files/js/search.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/files/js/search.js') diff --git a/apps/files/js/search.js b/apps/files/js/search.js index 394bcb48603..d35cacfa402 100644 --- a/apps/files/js/search.js +++ b/apps/files/js/search.js @@ -133,7 +133,7 @@ this.handleFolderClick = function($row, result, event) { // open folder - if (self.fileAppLoaded()) { + if (self.fileAppLoaded() && self.fileList.id === 'files') { self.fileList.changeDirectory(result.path); return false; } else { @@ -142,7 +142,7 @@ }; this.handleFileClick = function($row, result, event) { - if (self.fileAppLoaded()) { + if (self.fileAppLoaded() && self.fileList.id === 'files') { self.fileList.changeDirectory(OC.dirname(result.path)); self.fileList.scrollTo(result.name); return false; -- cgit v1.2.3 From 39b533d0d89557a2349dd09b4602ab7a1a8cb9ec Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 24 Jun 2016 11:32:14 +0200 Subject: Hide search results after switching directory When clicking on a folder result in the search result list, the result box for "results in another folder" must disappear. --- apps/files/js/search.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'apps/files/js/search.js') diff --git a/apps/files/js/search.js b/apps/files/js/search.js index d35cacfa402..625e4b13f4b 100644 --- a/apps/files/js/search.js +++ b/apps/files/js/search.js @@ -184,6 +184,13 @@ search.setHandler('folder', this.handleFolderClick.bind(this)); search.setHandler(['file', 'audio', 'image'], this.handleFileClick.bind(this)); + + if (self.fileAppLoaded()) { + // hide results when switching directory outside of search results + $('#app-content').delegate('>div', 'changeDirectory', function() { + search.clear(); + }); + } } }; OCA.Search.Files = Files; -- cgit v1.2.3