mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable search field in case there is no search available to the current selected app - fixes #14544

This commit is contained in:
Thomas Müller 2015-06-08 20:18:41 +02:00
parent 64c9c27f7e
commit 0dd990839e
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/search/js/search.js
View File

@ -94,6 +94,9 @@
/** /**
* Do a search query and display the results * Do a search query and display the results
* @param {string} query the search query * @param {string} query the search query
* @param inApps
* @param page
* @param size
*/ */
this.search = function(query, inApps, page, size) { this.search = function(query, inApps, page, size) {
if (query) { if (query) {
@ -160,7 +163,8 @@
var summaryAndStatusHeight = 118; var summaryAndStatusHeight = 118;
function isStatusOffScreen() { function isStatusOffScreen() {
return $searchResults.position() && ($searchResults.position().top + summaryAndStatusHeight > window.innerHeight); return $searchResults.position() &&
($searchResults.position().top + summaryAndStatusHeight > window.innerHeight);
} }
function placeStatus() { function placeStatus() {
@ -252,10 +256,11 @@
* Event handler for when scrolling the list container. * Event handler for when scrolling the list container.
* This appends/renders the next page of entries when reaching the bottom. * This appends/renders the next page of entries when reaching the bottom.
*/ */
function onScroll(e) { function onScroll() {
if ($searchResults && lastQuery !== false && lastResults.length > 0) { if ($searchResults && lastQuery !== false && lastResults.length > 0) {
var resultsBottom = $searchResults.offset().top + $searchResults.height(); var resultsBottom = $searchResults.offset().top + $searchResults.height();
var containerBottom = $searchResults.offsetParent().offset().top + $searchResults.offsetParent().height(); var containerBottom = $searchResults.offsetParent().offset().top +
$searchResults.offsetParent().height();
if ( resultsBottom < containerBottom * 1.2 ) { if ( resultsBottom < containerBottom * 1.2 ) {
self.search(lastQuery, lastInApps, lastPage + 1); self.search(lastQuery, lastInApps, lastPage + 1);
} }
@ -289,7 +294,7 @@
event.preventDefault(); event.preventDefault();
}); });
$searchBox.on('search', function (event) { $searchBox.on('search', function () {
if($searchBox.val() === '') { if($searchBox.val() === '') {
if(self.hasFilter(getCurrentApp())) { if(self.hasFilter(getCurrentApp())) {
self.getFilter(getCurrentApp())(''); self.getFilter(getCurrentApp())('');
@ -359,6 +364,14 @@
placeStatus(); placeStatus();
OC.Plugins.attach('OCA.Search', this); OC.Plugins.attach('OCA.Search', this);
// hide search file if search is not enabled
if(self.hasFilter(getCurrentApp())) {
return;
}
if ($searchResults.length === 0) {
$searchBox.hide();
}
} }
}; };
OCA.Search = Search; OCA.Search = Search;