summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2015-01-05 14:28:09 +0100
committerJörn Friedrich Dreyer <jfd@butonic.de>2015-01-05 14:28:09 +0100
commit10038640aeab6b156c15cac9fe8da438dad31d7b (patch)
tree0737dc52c83aefbc0d51157de2cc4e49e97a1449 /apps
parentba931d2124a915233d99edabdac730f3a9abdd54 (diff)
downloadnextcloud-server-10038640aeab6b156c15cac9fe8da438dad31d7b.tar.gz
nextcloud-server-10038640aeab6b156c15cac9fe8da438dad31d7b.zip
fix onScroll breaking search, fix keyboard navigation, fix filter for files in other dirs
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/search.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/files/js/search.js b/apps/files/js/search.js
index 5fb10ef34cd..496c210232a 100644
--- a/apps/files/js/search.js
+++ b/apps/files/js/search.js
@@ -34,7 +34,12 @@
return !!OCA.Files && !!OCA.Files.App;
};
function inFileList($row, result) {
- return self.fileAppLoaded() && self.fileList.inList(result.name);
+ if (! self.fileAppLoaded()) {
+ return false;
+ }
+ var dir = self.fileList.getCurrentDirectory().replace(/\/+$/,'');
+ var resultDir = OC.dirname(result.path);
+ return dir === resultDir && self.fileList.inList(result.name);
}
function updateLegacyMimetype(result) {
// backward compatibility: