Improve search settings
This commit is contained in:
parent
c78c67ffed
commit
a3f7d8b948
9 changed files with 47 additions and 33 deletions
|
@ -139,20 +139,20 @@ ul.pagination {
|
||||||
|
|
||||||
.book-search {
|
.book-search {
|
||||||
#book-search-input {
|
#book-search-input {
|
||||||
|
opacity: .33;
|
||||||
|
|
||||||
border: 0;
|
border: 0;
|
||||||
border-bottom: $padding-1 solid $gray-200;
|
border-bottom: $padding-1 solid $body-font-color;
|
||||||
outline: none;
|
outline: none;
|
||||||
|
|
||||||
padding: $padding-4 $padding-8 $padding-4 $padding-16 + $padding-4;
|
padding: $padding-4 $padding-8 $padding-4 $padding-16 + $padding-4;
|
||||||
margin-bottom: $padding-4;
|
|
||||||
|
|
||||||
width: 85%;
|
width: 85%;
|
||||||
|
|
||||||
background: url("svg/search.svg") left center no-repeat;
|
background: url("svg/search.svg") left center no-repeat;
|
||||||
background-size: $padding-16;
|
background-size: $padding-16;
|
||||||
|
|
||||||
&:focus {
|
&:focus {
|
||||||
border-bottom-color: $body-font-color;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,9 +14,9 @@
|
||||||
window.bookSearch = {
|
window.bookSearch = {
|
||||||
pages: pages,
|
pages: pages,
|
||||||
idx: lunr(function() {
|
idx: lunr(function() {
|
||||||
this.ref('idx');
|
this.ref("idx");
|
||||||
this.field('title');
|
this.field("title", { boost: 10000 });
|
||||||
this.field('content');
|
this.field("content");
|
||||||
|
|
||||||
pages.forEach(this.add, this);
|
pages.forEach(this.add, this);
|
||||||
}),
|
}),
|
||||||
|
|
|
@ -6,14 +6,12 @@
|
||||||
const dummy = document.querySelector("#book-search-dummy");
|
const dummy = document.querySelector("#book-search-dummy");
|
||||||
|
|
||||||
input.addEventListener("focus", init);
|
input.addEventListener("focus", init);
|
||||||
|
input.addEventListener("keyup", search);
|
||||||
|
|
||||||
function init() {
|
function init() {
|
||||||
loadScript("{{ "lunr.min.js" | relURL }}")
|
loadScript("{{ "lunr.min.js" | relURL }}")
|
||||||
loadScript("{{ $searchData.RelPermalink }}", function() {
|
loadScript("{{ $searchData.RelPermalink }}", search);
|
||||||
input.disabled = false;
|
|
||||||
input.addEventListener("keyup", search);
|
|
||||||
search();
|
|
||||||
});
|
|
||||||
input.removeEventListener("focus", init);
|
input.removeEventListener("focus", init);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,19 +20,34 @@
|
||||||
results.removeChild(results.firstChild);
|
results.removeChild(results.firstChild);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (input.value) {
|
if (!input.value || !window.bookSearch) {
|
||||||
const hits = window.bookSearch.idx.search(`${input.value}*`);
|
return
|
||||||
hits.slice(0, 10).forEach(function(hit) {
|
|
||||||
const page = window.bookSearch.pages[hit.ref];
|
|
||||||
const li = dummy.querySelector("li").cloneNode(true),
|
|
||||||
a = li.querySelector("a");
|
|
||||||
|
|
||||||
a.href = page.href;
|
|
||||||
a.textContent = page.title;
|
|
||||||
|
|
||||||
results.appendChild(li);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const terms = lunr.tokenizer(input.value);
|
||||||
|
const searchHits = window.bookSearch.idx.query(function(query) {
|
||||||
|
query.term(terms, {
|
||||||
|
boost: 100,
|
||||||
|
});
|
||||||
|
query.term(terms, {
|
||||||
|
boost: 10,
|
||||||
|
wildcard: lunr.Query.wildcard.LEADING | lunr.Query.wildcard.TRAILING,
|
||||||
|
});
|
||||||
|
query.term(terms, {
|
||||||
|
editDistance: 2
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
searchHits.slice(0, 10).forEach(function(hit) {
|
||||||
|
const page = window.bookSearch.pages[hit.ref];
|
||||||
|
const li = dummy.querySelector("li").cloneNode(true),
|
||||||
|
a = li.querySelector("a");
|
||||||
|
|
||||||
|
a.href = page.href;
|
||||||
|
a.textContent = page.title;
|
||||||
|
|
||||||
|
results.appendChild(li);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function loadScript(src, callback) {
|
function loadScript(src, callback) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1 +1 @@
|
||||||
{"Target":"search-data.min.cab714d6cdc1fd81a6e2d8e454a03c6b8c74b4680118a20d06f2f4cc11365cdf.js","MediaType":"application/javascript","Data":{"Integrity":"sha256-yrcU1s3B/YGm4tjkVKA8a4x0tGgBGKINBvL0zBE2XN8="}}
|
{"Target":"search-data.min.34183091f91a205581bbdcc247f638b72d22f51e34ab573b24519f95c4a92895.js","MediaType":"application/javascript","Data":{"Integrity":"sha256-NBgwkfkaIFWBu9zCR/Y4ty0i9R40q1c7JFGflcSpKJU="}}
|
|
@ -1,5 +1,6 @@
|
||||||
(function(){const input=document.querySelector("#book-search-input");const results=document.querySelector("#book-search-results");const dummy=document.querySelector("#book-search-dummy");input.addEventListener("focus",init);function init(){loadScript("/example/lunr.min.js")
|
(function(){const input=document.querySelector("#book-search-input");const results=document.querySelector("#book-search-results");const dummy=document.querySelector("#book-search-dummy");input.addEventListener("focus",init);input.addEventListener("keyup",search);function init(){loadScript("/example/lunr.min.js")
|
||||||
loadScript("/example/search-data.min.cab714d6cdc1fd81a6e2d8e454a03c6b8c74b4680118a20d06f2f4cc11365cdf.js",function(){input.disabled=false;input.addEventListener("keyup",search);search();});input.removeEventListener("focus",init);}
|
loadScript("/example/search-data.min.34183091f91a205581bbdcc247f638b72d22f51e34ab573b24519f95c4a92895.js",search);input.removeEventListener("focus",init);}
|
||||||
function search(){while(results.firstChild){results.removeChild(results.firstChild);}
|
function search(){while(results.firstChild){results.removeChild(results.firstChild);}
|
||||||
if(input.value){const hits=window.bookSearch.idx.search(`${input.value}*`);hits.slice(0,10).forEach(function(hit){const page=window.bookSearch.pages[hit.ref];const li=dummy.querySelector("li").cloneNode(true),a=li.querySelector("a");a.href=page.href;a.textContent=page.title;results.appendChild(li);});}}
|
if(!input.value||!window.bookSearch){return}
|
||||||
|
const terms=lunr.tokenizer(input.value);const searchHits=window.bookSearch.idx.query(function(query){query.term(terms,{boost:100,});query.term(terms,{boost:10,wildcard:lunr.Query.wildcard.LEADING|lunr.Query.wildcard.TRAILING,});query.term(terms,{editDistance:2});});searchHits.slice(0,10).forEach(function(hit){const page=window.bookSearch.pages[hit.ref];const li=dummy.querySelector("li").cloneNode(true),a=li.querySelector("a");a.href=page.href;a.textContent=page.title;results.appendChild(li);});}
|
||||||
function loadScript(src,callback){const script=document.createElement("script");script.defer=true;script.src=src;script.onload=callback;document.head.append(script);}})();
|
function loadScript(src,callback){const script=document.createElement("script");script.defer=true;script.src=src;script.onload=callback;document.head.append(script);}})();
|
|
@ -1 +1 @@
|
||||||
{"Target":"search.min.afa201b2745d9b5797e20db513cc1109f4ab834ef3290ffc160dc856c39654ee.js","MediaType":"application/javascript","Data":{"Integrity":"sha256-r6IBsnRdm1eX4g21E8wRCfSrg07zKQ/8Fg3IVsOWVO4="}}
|
{"Target":"search.min.1f579a6bfcf647662ed7d1c6328560f89ac36825f447b8babab6da52f23738a7.js","MediaType":"application/javascript","Data":{"Integrity":"sha256-H1eaa/z2R2Yu19HGMoVg+JrDaCX0R7i6urbaUvI3OKc="}}
|
File diff suppressed because one or more lines are too long
|
@ -1 +1 @@
|
||||||
{"Target":"book.min.86522616af955ba5e872c9c750ed949308f9065c096d3de681ff68732ba9d89d.css","MediaType":"text/css","Data":{"Integrity":"sha256-hlImFq+VW6XocsnHUO2Ukwj5BlwJbT3mgf9ocyup2J0="}}
|
{"Target":"book.min.d957ded8b0d85eeacfd42502592de956866a48868f317cb69b9776c15309f870.css","MediaType":"text/css","Data":{"Integrity":"sha256-2Vfe2LDYXurP1CUCWS3pVoZqSIaPMXy2m5d2wVMJ+HA="}}
|
Loading…
Reference in a new issue