Skip to content
Snippets Groups Projects
Unverified Commit a1d7d606 authored by John Molakvoæ's avatar John Molakvoæ
Browse files

Fix search on public pages

parent fb77ff9d
No related branches found
No related tags found
No related merge requests found
...@@ -52,10 +52,13 @@ ...@@ -52,10 +52,13 @@
var self = this; var self = this;
if (typeof searchCallback !== 'function') { if (typeof searchCallback !== 'function') {
throw 'searchCallback must be a function'; throw new Error('searchCallback must be a function');
} }
if (typeof resetCallback !== '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; this.searchCallback = searchCallback;
......
...@@ -413,26 +413,27 @@ ...@@ -413,26 +413,27 @@
$(document).ready(function() { $(document).ready(function() {
var $searchResults = $('#searchresults'); var $searchResults = $('#searchresults');
if ($searchResults.length > 0) { var $searchBox = $('#searchbox');
if ($searchResults.length > 0 && $searchBox.length > 0) {
$searchResults.addClass('hidden'); $searchResults.addClass('hidden');
$('#app-content')
.find('.viewcontainer')
.css('min-height', 'initial');
$searchResults.load( $searchResults.load(
OC.webroot + '/core/search/templates/part.results.html', OC.webroot + '/core/search/templates/part.results.html',
function() { function() {
OC.Search = new OCA.Search.Core( OC.Search = new OCA.Search.Core(
$('#searchbox'), $searchBox,
$('#searchresults') $searchResults
); );
} }
); );
} else { } else {
// check again later
_.defer(function() { _.defer(function() {
OC.Search = new OCA.Search.Core( if ($searchResults.length > 0 && $searchBox.length > 0) {
$('#searchbox'), OC.Search = new OCA.Search.Core(
$('#searchresults') $searchBox,
); $searchResults
);
}
}); });
} }
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment