Skip to content

Fix search on public pages #10385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Jul 25, 2018
Merged

Fix search on public pages #10385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions core/search/js/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
21 changes: 11 additions & 10 deletions core/search/js/searchprovider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
}
});
}
});
Expand Down