From d61c2b3c686b1cbbfe00c25ac95e050c716f4cdb Mon Sep 17 00:00:00 2001 From: shiftinv Date: Mon, 13 Jun 2022 15:16:47 +0200 Subject: [PATCH 1/3] Fix search summary element type --- sphinx/themes/basic/static/searchtools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx/themes/basic/static/searchtools.js b/sphinx/themes/basic/static/searchtools.js index ac4d5861f9..f319a7e5d0 100644 --- a/sphinx/themes/basic/static/searchtools.js +++ b/sphinx/themes/basic/static/searchtools.js @@ -516,7 +516,7 @@ const Search = { const top = startWithContext === 0 ? "" : "..."; const tail = startWithContext + 240 < text.length ? "..." : ""; - let summary = document.createElement("div"); + let summary = document.createElement("p"); summary.classList.add("context"); summary.innerText = top + text.substr(startWithContext, 240).trim() + tail; From 7671d60dfde7a82b62b7f367a6a10897fea852ab Mon Sep 17 00:00:00 2001 From: shiftinv Date: Mon, 13 Jun 2022 15:29:03 +0200 Subject: [PATCH 2/3] Fix search summary capitalization --- sphinx/themes/basic/static/searchtools.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sphinx/themes/basic/static/searchtools.js b/sphinx/themes/basic/static/searchtools.js index f319a7e5d0..6ba93e5154 100644 --- a/sphinx/themes/basic/static/searchtools.js +++ b/sphinx/themes/basic/static/searchtools.js @@ -504,11 +504,12 @@ const Search = { * latter for highlighting it. */ makeSearchSummary: (htmlText, keywords, highlightWords) => { - const text = Search.htmlToText(htmlText).toLowerCase(); + const text = Search.htmlToText(htmlText); if (text === "") return null; + const textLower = text.toLowerCase(); const actualStartPosition = [...keywords] - .map((k) => text.indexOf(k.toLowerCase())) + .map((k) => textLower.indexOf(k.toLowerCase())) .filter((i) => i > -1) .slice(-1)[0]; const startWithContext = Math.max(actualStartPosition - 120, 0); From fe6658e939386683a3a128fd68e9584e2802cb37 Mon Sep 17 00:00:00 2001 From: shiftinv Date: Mon, 13 Jun 2022 15:38:05 +0200 Subject: [PATCH 3/3] Fix removal of header links in search summary --- sphinx/themes/basic/static/searchtools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx/themes/basic/static/searchtools.js b/sphinx/themes/basic/static/searchtools.js index 6ba93e5154..5ed91c92d5 100644 --- a/sphinx/themes/basic/static/searchtools.js +++ b/sphinx/themes/basic/static/searchtools.js @@ -158,7 +158,7 @@ const Search = { const htmlElement = document .createRange() .createContextualFragment(htmlString); - _removeChildren(htmlElement.querySelectorAll(".headerlink")); + htmlElement.querySelectorAll(".headerlink").forEach((el) => el.parentNode.removeChild(el)); const docContent = htmlElement.querySelector('[role="main"]'); if (docContent !== undefined) return docContent.textContent; console.warn(