wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix onScroll breaking search, fix keyboard navigation, fix filter for files in other dirs

Browse source
This commit is contained in:
Jörn Friedrich Dreyer 2015-01-05 14:28:09 +01:00
parent ba931d2124
commit 10038640ae
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/files/js/search.js
View file

@ -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:

4
search/js/search.js
View file

@ -213,7 +213,7 @@
var result = $searchResults.find('tr.result')[currentResult];
if (result) {
var $result = $(result);
var currentOffset = $searchResults.scrollTop();
var currentOffset = $('#app-content').scrollTop();
$('#app-content').animate({
// Scrolling to the top of the new result
scrollTop: currentOffset + $result.offset().top - $result.height() * 2
@ -235,7 +235,7 @@
* This appends/renders the next page of entries when reaching the bottom.
*/
function onScroll(e) {
if ($searchResults) {
if ($searchResults && lastQuery !== false) {
var resultsBottom = $searchResults.offset().top + $searchResults.height();
var containerBottom = $searchResults.offsetParent().offset().top + $searchResults.offsetParent().height();
if ( resultsBottom < containerBottom * 1.2 ) {