T53161 WIP javascript search WIP WIP
This commit is contained in:
parent
d2a8f2a47f
commit
41eb5e256f
@ -7,16 +7,44 @@ $(document).ready(function() {
|
|||||||
|
|
||||||
if (typeof algoliaIndex === 'undefined') return;
|
if (typeof algoliaIndex === 'undefined') return;
|
||||||
|
|
||||||
|
var elasticSearch = function() {
|
||||||
|
|
||||||
|
console.log('yay');
|
||||||
|
|
||||||
|
return function findMatches(q, cb, async){
|
||||||
|
let newhits = [];
|
||||||
|
// do a query
|
||||||
|
console.log(q);
|
||||||
|
$.getJSON("/api/newsearch?q=" + q, function( data ) {
|
||||||
|
console.log(data.hits.hits);
|
||||||
|
let hits = data.hits.hits;
|
||||||
|
newhits = hits.map(function(hit){
|
||||||
|
console.log(hit._source);
|
||||||
|
return hit._source;
|
||||||
|
});
|
||||||
|
console.log(newhits);
|
||||||
|
cb(newhits);
|
||||||
|
console.log(cb);
|
||||||
|
async();
|
||||||
|
});
|
||||||
|
//api/newsearch?q=test%20dji
|
||||||
|
// return the matches..
|
||||||
|
//cb(matches);
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
var searchInput = $('#cloud-search');
|
var searchInput = $('#cloud-search');
|
||||||
|
|
||||||
var tu = searchInput.typeahead({hint: true}, {
|
var tu = searchInput.typeahead({hint: true}, {
|
||||||
source: algoliaIndex.ttAdapter(),
|
//source: algoliaIndex.ttAdapter(),
|
||||||
|
source: elasticSearch(),
|
||||||
displayKey: 'name',
|
displayKey: 'name',
|
||||||
limit: 10,
|
limit: 10,
|
||||||
minLength: 0,
|
minLength: 0,
|
||||||
templates: {
|
templates: {
|
||||||
suggestion: function(hit) {
|
suggestion: function(hit) {
|
||||||
|
console.log('hit2');
|
||||||
|
console.log(hit);
|
||||||
var hitMedia = (hit.media ? ' · <span class="media">'+hit.media+'</span>' : '');
|
var hitMedia = (hit.media ? ' · <span class="media">'+hit.media+'</span>' : '');
|
||||||
var hitFree = (hit.is_free ? '<div class="search-hit-ribbon"><span>free</span></div>' : '');
|
var hitFree = (hit.is_free ? '<div class="search-hit-ribbon"><span>free</span></div>' : '');
|
||||||
var hitPicture;
|
var hitPicture;
|
||||||
@ -76,6 +104,7 @@ $(document).ready(function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
searchInput.keyup(function(e) {
|
searchInput.keyup(function(e) {
|
||||||
|
console.log('upupup');
|
||||||
if ( $('.tt-dataset').is(':empty') ){
|
if ( $('.tt-dataset').is(':empty') ){
|
||||||
if(e.keyCode == 13){
|
if(e.keyCode == 13){
|
||||||
window.location.href = '/search#q='+ $("#cloud-search").val() + '&page=1';
|
window.location.href = '/search#q='+ $("#cloud-search").val() + '&page=1';
|
||||||
@ -84,6 +113,9 @@ $(document).ready(function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
searchInput.bind('typeahead:render', function(event, suggestions, async, dataset) {
|
searchInput.bind('typeahead:render', function(event, suggestions, async, dataset) {
|
||||||
|
console.log('woot');
|
||||||
|
console.log(suggestions);
|
||||||
|
console.log(dataset);
|
||||||
if( suggestions != undefined && $('.tt-all-results').length <= 0){
|
if( suggestions != undefined && $('.tt-all-results').length <= 0){
|
||||||
$('.tt-dataset').append(
|
$('.tt-dataset').append(
|
||||||
'<a id="search-advanced" href="/search#q='+ $("#cloud-search").val() + '&page=1" class="search-site-result advanced tt-suggestion">' +
|
'<a id="search-advanced" href="/search#q='+ $("#cloud-search").val() + '&page=1" class="search-site-result advanced tt-suggestion">' +
|
||||||
|
Loading…
x
Reference in New Issue
Block a user