diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2015-01-05 17:53:14 +0100 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2015-01-05 17:53:14 +0100 |
| commit | 7a812801db6cc2cddf4e176dc893b07c7c486d76 (patch) | |
| tree | c89db47b3fb160cbec4faeddc2f0606f2f327b3a | |
| parent | 10038640aeab6b156c15cac9fe8da438dad31d7b (diff) | |
| download | nextcloud-server-7a812801db6cc2cddf4e176dc893b07c7c486d76.tar.gz nextcloud-server-7a812801db6cc2cddf4e176dc893b07c7c486d76.zip | |
correctly clear searchbox when switching filelists
| -rw-r--r-- | apps/files/js/filelist.js | 3 | ||||
| -rw-r--r-- | search/js/search.js | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 768fc77df24..3e61e50f75d 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1713,6 +1713,9 @@ if (OCA.Search.files) { OCA.Search.files.setFileList(this); } + if (OC.Search) { + OC.Search.clear(); + } }, /** * Update UI based on the current selection diff --git a/search/js/search.js b/search/js/search.js index 58778900a69..c595ae25092 100644 --- a/search/js/search.js +++ b/search/js/search.js @@ -229,6 +229,14 @@ $searchResults.find('tr.result').remove(); lastQuery = false; }; + this.clear = function() { + self.hideResults(); + if(self.hasFilter(getCurrentApp())) { + self.getFilter(getCurrentApp())(''); + } + $searchBox.val(''); + $searchBox.blur(); + }; /** * Event handler for when scrolling the list container. |