upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 14:23:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merge pull request #10385 from nextcloud/search-init-fix

Browse source 
Fix search on public pages
This commit is contained in:
Morris Jobke 2018-07-25 13:43:23 +02:00 committed by GitHub
commit ebeaa37da2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/search/js/search.js
View file

@ -52,10 +52,13 @@
var self = this;
if (typeof searchCallback !== 'function') {
throw 'searchCallback must be a function';
throw new Error('searchCallback must be a function');
}
if (typeof resetCallback !== 'function') {
throw 'resetCallback must be a function';
throw new Error('resetCallback must be a function');
}
if (!document.getElementById('searchbox')) {
throw new Error('searchBox not available');
}
this.searchCallback = searchCallback;

21
core/search/js/searchprovider.js
View file

@ -413,26 +413,27 @@
$(document).ready(function() {
var $searchResults = $('#searchresults');
if ($searchResults.length > 0) {
var $searchBox = $('#searchbox');
if ($searchResults.length > 0 && $searchBox.length > 0) {
$searchResults.addClass('hidden');
$('#app-content')
.find('.viewcontainer')
.css('min-height', 'initial');
$searchResults.load(
OC.webroot + '/core/search/templates/part.results.html',
function() {
OC.Search = new OCA.Search.Core(
$('#searchbox'),
$('#searchresults')
$searchBox,
$searchResults
);
}
);
} else {
// check again later
_.defer(function() {
OC.Search = new OCA.Search.Core(
$('#searchbox'),
$('#searchresults')
);
if ($searchResults.length > 0 && $searchBox.length > 0) {
OC.Search = new OCA.Search.Core(
$searchBox,
$searchResults
);
}
});
}
});