Jacky Zhao
2022-11-22 e374e3abd42c1719ad1fdc6bd9c641efb2ddf954
fix: jump to search for operand
4 files modified
34 ■■■■■ changed files
assets/js/full-text-search.js 2 ●●● patch | view | raw | blame | history
assets/js/semantic-search.js 4 ●●●● patch | view | raw | blame | history
assets/js/util.js 26 ●●●● patch | view | raw | blame | history
layouts/partials/head.html 2 ●●●●● patch | view | raw | blame | history
assets/js/full-text-search.js
@@ -56,6 +56,6 @@
    }
    const allIds = new Set([...getByField("title"), ...getByField("content")])
    const finalResults = [...allIds].map(formatForDisplay)
    displayResults(finalResults, true)
    displayResults(term, finalResults, true)
  })
})()
assets/js/semantic-search.js
@@ -24,7 +24,7 @@
    },
    body: JSON.stringify({
      query: query,
      limit: 8,
      limit: 10,
    }),
  })
  if (result.ok) {
@@ -48,7 +48,7 @@
  debounce((e) => {
    let term = e.target.value
    if (term !== "") {
      searchContents(term).then((results) => displayResults(results))
      searchContents(term).then((results) => displayResults(term, results))
    }
  }),
)
assets/js/util.js
@@ -115,9 +115,11 @@
}
const redir = (id, term) => {
  // SPA navigation
  const shouldTrim = PRODUCTION && SEARCH_ENABLED
  const baseURLPrefix = shouldTrim ? "" : BASE_URL.replace(/\/$/g, "")
  const urlString = `${baseURLPrefix}${id}#:~:text=${encodeURIComponent(term)}/`
  window.Million.navigate(
    new URL(`${BASE_URL.replace(/\/$/g, "")}${id}#:~:text=${encodeURIComponent(term)}/`),
    new URL(urlString),
    ".singlePage",
  )
  closeSearch()
@@ -179,7 +181,7 @@
  })
}
const displayResults = (finalResults, extractHighlight = false) => {
const displayResults = (term, finalResults, extractHighlight = false) => {
  const results = document.getElementById("results-container")
  if (finalResults.length === 0) {
    results.innerHTML = `<button class="result-card">
@@ -189,16 +191,16 @@
  } else {
    results.innerHTML = finalResults
      .map((result) => {
          if (extractHighlight) {
            return resultToHTML({
              url: result.url,
              title: highlight(result.title, term),
              content: highlight(removeMarkdown(result.content), term)
            })
          } else {
            return resultToHTML(result)
          }
        if (extractHighlight) {
          return resultToHTML({
            url: result.url,
            title: highlight(result.title, term),
            content: highlight(removeMarkdown(result.content), term)
          })
        } else {
          return resultToHTML(result)
        }
      }
      )
      .join("\n")
    const anchors = [...document.getElementsByClassName("result-card")]
layouts/partials/head.html
@@ -79,6 +79,8 @@
  "indices/contentIndex.json" | resources.Fingerprint "md5" | resources.Minify
  }}
  <script>
    const SEARCH_ENABLED = {{.Site.Data.config.search.enableSemanticSearch}}
    const PRODUCTION = {{ hugo.IsProduction }}
    const BASE_URL = {{.Site.BaseURL}}
    const fetchData = Promise.all([
          fetch("{{ $linkIndex.Permalink }}")