Skip to content

Commit 5c9097b

Browse files
committed
Restored the default search method of lunr
Signed-off-by: Hofi <[email protected]>
1 parent 43efe1a commit 5c9097b

File tree

2 files changed

+29
-15
lines changed

2 files changed

+29
-15
lines changed
Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
{% assign lang = site.locale | slice: 0,2 | default: "en" %}
1+
{% comment %}
2+
<!-- {% assign lang = site.locale | slice: 0,2 | default: "en" %}
3+
4+
NOTE: currently only EN is supported
5+
26
{% case lang %}
37
{% when "gr" %}
48
{% assign lang = "gr" %}
59
{% else %}
610
{% assign lang = "en" %}
7-
{% endcase %}
11+
{% endcase %} -->
12+
{% endcomment %}
13+
{% assign lang = "en" %}
814
<script src="{{ '/assets/js/lunr/lunr.min.js' | relative_url }}"></script>
915
<script src="{{ '/assets/js/lunr/lunr-store.js' | relative_url }}"></script>
1016
<script src="{{ '/assets/js/lunr/lunr-' | append: lang | append: '.js' | relative_url }}"></script>

_js/lunr/lunr-en.js

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ function getCookie(name) {
5757
return null;
5858
}
5959

60+
61+
6062
$(document).ready(function() {
6163

6264
// Function to restore input field value from cookie
@@ -81,20 +83,26 @@ $(document).ready(function() {
8183
var resultdiv = $('#results');
8284
var searchInput = document.getElementById('search');
8385
var query = searchInput.value.toLowerCase();
84-
var result =
85-
idx.query(function (q) {
86-
query.split(lunr.tokenizer.separator).forEach(function (term) {
87-
q.term(term, { boost: 100 })
88-
if (query.lastIndexOf(" ") != query.length - 1) {
89-
q.term(term, { usePipeline: false, wildcard: lunr.Query.wildcard.TRAILING, boost: 10 })
90-
}
91-
if (term != "") {
92-
q.term(term, { usePipeline: false, editDistance: 1, boost: 1 })
93-
}
94-
})
95-
});
86+
var result = query !== '' ? idx.search(query) : [];
87+
// NOTE: Turned off this Minimal Mistakes version, as
88+
// - we want to support the original search expressions
89+
// - seems the original version gives much natural results
90+
//
91+
// var result = idx.query(function (q) {
92+
// query.split(lunr.tokenizer.separator).forEach(function (term) {
93+
// q.term(term, { boost: 100 })
94+
// if (query.lastIndexOf(" ") != query.length - 1) {
95+
// q.term(term, { usePipeline: false, wildcard: lunr.Query.wildcard.TRAILING, boost: 10 })
96+
// }
97+
// if (term != "") {
98+
// q.term(term, { usePipeline: false, editDistance: 1, boost: 1 })
99+
// }
100+
// })
101+
// });
102+
96103
resultdiv.empty();
97-
resultdiv.prepend('<p class="results__found">' + result.length + ' {{ site.data.ui-text[site.locale].results_found | default: "Result(s) found" }}</p>');
104+
if (query !== '')
105+
resultdiv.prepend('<p class="results__found">' + result.length + ' {{ site.data.ui-text[site.locale].results_found | default: "Result(s) found" }}</p>');
98106
for (var item in result) {
99107
var ref = result[item].ref;
100108
if (store[ref].teaser) {

0 commit comments

Comments
 (0)