From 625f202275d7a835d0449b838a8971de45656596 Mon Sep 17 00:00:00 2001 From: Alex Shpak Date: Tue, 16 Jul 2019 14:49:19 +0200 Subject: [PATCH] Make lunr to load on search interaction as well --- assets/search.js | 1 + .../js/search.js_db9e329433ffca0798ed12c88043b3b3.content | 3 ++- .../assets/js/search.js_db9e329433ffca0798ed12c88043b3b3.json | 2 +- layouts/partials/docs/html-head.html | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/assets/search.js b/assets/search.js index c91baf2..e29f183 100644 --- a/assets/search.js +++ b/assets/search.js @@ -8,6 +8,7 @@ input.addEventListener("focus", init); function init() { + loadScript("{{ "lunr.min.js" | relURL }}") loadScript("{{ $searchData.RelPermalink }}", function() { input.disabled = false; input.addEventListener("keyup", search); diff --git a/exampleSite/resources/_gen/assets/js/search.js_db9e329433ffca0798ed12c88043b3b3.content b/exampleSite/resources/_gen/assets/js/search.js_db9e329433ffca0798ed12c88043b3b3.content index 25e540d..da47c12 100644 --- a/exampleSite/resources/_gen/assets/js/search.js_db9e329433ffca0798ed12c88043b3b3.content +++ b/exampleSite/resources/_gen/assets/js/search.js_db9e329433ffca0798ed12c88043b3b3.content @@ -1,4 +1,5 @@ -(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/search-data.min.cab714d6cdc1fd81a6e2d8e454a03c6b8c74b4680118a20d06f2f4cc11365cdf.js",function(){input.disabled=false;input.addEventListener("keyup",search);search();});input.removeEventListener("focus",init);} +(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") +loadScript("/example/search-data.min.cab714d6cdc1fd81a6e2d8e454a03c6b8c74b4680118a20d06f2f4cc11365cdf.js",function(){input.disabled=false;input.addEventListener("keyup",search);search();});input.removeEventListener("focus",init);} 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);});}} function loadScript(src,callback){const script=document.createElement("script");script.defer=true;script.src=src;script.onload=callback;document.head.append(script);}})(); \ No newline at end of file diff --git a/exampleSite/resources/_gen/assets/js/search.js_db9e329433ffca0798ed12c88043b3b3.json b/exampleSite/resources/_gen/assets/js/search.js_db9e329433ffca0798ed12c88043b3b3.json index 50a045c..f6bbdf4 100644 --- a/exampleSite/resources/_gen/assets/js/search.js_db9e329433ffca0798ed12c88043b3b3.json +++ b/exampleSite/resources/_gen/assets/js/search.js_db9e329433ffca0798ed12c88043b3b3.json @@ -1 +1 @@ -{"Target":"search.min.5ae5d994d1717ea382e93b3e44fb0739908cf020af0b39c2f591a91c7562b1bc.js","MediaType":"application/javascript","Data":{"Integrity":"sha256-WuXZlNFxfqOC6Ts+RPsHOZCM8CCvCznC9ZGpHHVisbw="}} \ No newline at end of file +{"Target":"search.min.afa201b2745d9b5797e20db513cc1109f4ab834ef3290ffc160dc856c39654ee.js","MediaType":"application/javascript","Data":{"Integrity":"sha256-r6IBsnRdm1eX4g21E8wRCfSrg07zKQ/8Fg3IVsOWVO4="}} \ No newline at end of file diff --git a/layouts/partials/docs/html-head.html b/layouts/partials/docs/html-head.html index 68b29bb..9946c37 100644 --- a/layouts/partials/docs/html-head.html +++ b/layouts/partials/docs/html-head.html @@ -8,7 +8,6 @@ {{ if default true .Site.Params.BookSearch }} {{- $searchJS := resources.Get "search.js" | resources.ExecuteAsTemplate "search.js" . | resources.Minify | resources.Fingerprint }} - {{ end }}