From 5cf5aa15660d6235acf46a68fadf95a33537a463 Mon Sep 17 00:00:00 2001 From: Ole Eskild Steensen Date: Mon, 9 Jan 2023 19:08:33 +0100 Subject: [PATCH] Allow searching both inline and frontmatter tags --- .eleventy.js | 2 +- netlify/functions/search/search.js | 4 ++-- src/site/_includes/components/searchScript.njk | 11 ----------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.eleventy.js b/.eleventy.js index 7614803..6ccd847 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -18,7 +18,7 @@ module.exports = function(eleventyConfig) { .use(require("markdown-it-hashtag")) .use(function(md){ md.renderer.rules.hashtag_open = function(tokens, idx) { - return '' + return '' } }) .use(require('markdown-it-mathjax3'), { diff --git a/netlify/functions/search/search.js b/netlify/functions/search/search.js index d793657..2b25f32 100644 --- a/netlify/functions/search/search.js +++ b/netlify/functions/search/search.js @@ -13,11 +13,11 @@ const handler = async (event) => { let results; if(search[0] == "#" && search.length > 1){ - results = index.search(`tags:${search.substring(1)}`) + results = index.search(`${search.substring(1)}`) }else if(search.length > 2 && search[0] == ">" && search[1] == "#"){ results = index.search(`${search.substring(2)}`) }else{ - results = index.search(search); + results = index.search(search+"*"); } results.forEach(r => { diff --git a/src/site/_includes/components/searchScript.njk b/src/site/_includes/components/searchScript.njk index a257e23..14fc91a 100644 --- a/src/site/_includes/components/searchScript.njk +++ b/src/site/_includes/components/searchScript.njk @@ -11,17 +11,6 @@ } } - - window.toggleInlineTagSearch=function(evt) { - console.log(evt.textContent); - const term = evt.textContent; - if(term){ - window.document.getElementById('term').value = '>' + term.trim(); - window.toggleSearch(); - window.search(); - } - } - window.toggleTagSearch=function(evt) { console.log(evt.textContent); const term = evt.textContent;