Skip to content

Fix search #198

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

Closed
Findus23 wants to merge 5 commits into from
Closed

Fix search #198

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e2e4a8
fix https://github.com/piwik/developer-documentation/issues/23
Findus23 Oct 24, 2017
c6027c7
update bootstrap-typeahead
Findus23 Oct 24, 2017
6635934
send /data/documents as JSON
Findus23 Oct 23, 2017
12c4473
reorganize search
Findus23 Oct 24, 2017
4c65059
remove console.log();
Findus23 Nov 10, 2017
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
68 changes: 31 additions & 37 deletions app/public/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,42 +24,36 @@ $('.documentation table').addClass('table table-striped table-bordered');

var quickSearchData = null;

var $quickSearchTypeahead = $('#quick-search-typeahead>input');
$quickSearchTypeahead.typeahead({
source: function (query, process) {
if (quickSearchData) {
process(quickSearchData.names);
} else {
var url = $quickSearchTypeahead.attr('data-action');

$.get(url, {}, function (data) {
quickSearchData = JSON.parse(data);
process(quickSearchData.names);
var $quickSearchTypeahead = $('#quick-search-typeahead').find('>input');
$quickSearchTypeahead.on("focus", function () {
var url = $quickSearchTypeahead.attr('data-action');
$.get(url, {}, function (quickSearchData) {
$quickSearchTypeahead.typeahead({
source: quickSearchData.names,
items: 'all',
updater: function (item) {
// get text to display in quick search box
var displayText = item;
console.log(item);
Copy link
Member

@mattab mattab Nov 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably want to remove the console.log

Copy link
Collaborator Author

@Findus23 Findus23 Nov 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right, I removed it in a163bae and forgot to also do so here.

But keep in mind that this function doesn't exist any more with the full text search in #200 as I am using a maintained fork of twitter bootstrap there, because it's more user friendly (results can be selected with the arrow keys)


var trailingEmLoc = displayText.indexOf('<em>');
if (trailingEmLoc !== -1) {
displayText = displayText.substring(0, trailingEmLoc);
}

// Track the search
_paq.push(['trackSiteSearch', displayText, false, false]);

// get URL to go to
var itemIndex = quickSearchData.names.indexOf(item);
if (itemIndex !== -1) {
window.location.href = quickSearchData.urls[itemIndex];
}

// return display text
return $.trim(displayText);
}
});
}
},
items: -1,
updater: function (item) {
// get text to display in quick search box
var displayText = item;

var trailingEmLoc = displayText.indexOf('<em>');
if (trailingEmLoc != -1) {
displayText = displayText.substring(0, trailingEmLoc);
}

// Track the search
_paq.push(['trackSiteSearch', displayText, false, false]);

// get URL to go to
var itemIndex = quickSearchData.names.indexOf(item);
if (itemIndex != -1) {
window.location.href = quickSearchData.urls[itemIndex];
}

// return display text
return $.trim(displayText);
}
});

});
});
});
Loading