joshlaymon/Illustrations
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update web/templates/entry_view.html

Browse Source
This commit is contained in:
Joshua Laymon 2025-08-24 00:43:45 +00:00
parent bdaef505a2
commit 151515058d
1 changed files with 30 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
web/templates/entry_view.html
View File

@ -467,20 +467,20 @@ function showToast(message, duration = 3000) {
}
</script>
<!-- Highlighter: choose the best field source (most fields wins), then sync LS -->
<!-- Highlighter: apply to ALL fields (ignores selected fields) -->
<script>
(function(){
const FIELD_TO_SELECTOR = {
subject: "#subject-list",
illustration: "#illustration-text",
application: "#application-text",
scripture_raw: "#scripture-text",
source: "#source-text",
talk_title: "#talk_title-text",
talk_number: "#talk_title-text"
};
// Target EVERY field we render on entry_view
const ALL_SELECTORS = [
"#subject-list",
"#illustration-text",
"#application-text",
"#scripture-text",
"#source-text",
"#talk_title-text"
];
// Fire on first paint and on bfcache restores
// Run on fresh load + bfcache restores
if (document.readyState === "complete" || document.readyState === "interactive") run();
else document.addEventListener("DOMContentLoaded", run, { once: true });
window.addEventListener("pageshow", run);
@ -489,7 +489,7 @@ function showToast(message, duration = 3000) {
async function run(){
if (ran) return;
// 1) Respect per-user toggle (defaults ON if flag missing)
// Respect per-user toggle (defaults ON if not present)
let enabled = true;
try {
const res = await fetch("/api/get-prefs/", { cache: "no-store", credentials: "same-origin" });
@ -500,62 +500,28 @@ function showToast(message, duration = 3000) {
} catch(_) {}
if (!enabled) { ran = true; return; }
// 2) Gather candidates from all sources
const cand = { tmpl: {q:"", fields:[]}, json: {q:"", fields:[]}, ls: {q:"", fields:[]} };
// Get the query (ignore fields entirely)
let q = (window.__lastSearchQ || "").trim();
// 2a) Template/script-literal variables (set by view)
cand.tmpl.q = (window.__lastSearchQ || '').trim();
cand.tmpl.fields = Array.isArray(window.__lastSearchFields) ? window.__lastSearchFields.slice() : [];
// 2b) JSON <script> block (if present)
// JSON script fallback
if (!q) {
const dataEl = document.getElementById("last-search-data");
if (dataEl) {
try {
const payload = JSON.parse(dataEl.textContent || "{}");
cand.json.q = (payload.q || "").trim();
cand.json.fields = Array.isArray(payload.fields) ? payload.fields.slice() : [];
} catch(_){}
}
// 2c) localStorage (may be stale)
cand.ls.q = (localStorage.getItem('lastSearchQ') || '').trim();
try { cand.ls.fields = JSON.parse(localStorage.getItem('lastSearchFields') || '[]') || []; } catch(_) { cand.ls.fields = []; }
// 3) Pick the best candidate: longest non-empty "fields" wins (ties: prefer template, then JSON, then LS)
const order = ["tmpl","json","ls"];
let bestKey = "";
let best = { q:"", fields:[] };
for (const k of order) {
const item = cand[k];
// prefer any candidate with more fields
if (item.fields && item.fields.length > (best.fields ? best.fields.length : 0)) {
bestKey = k;
best = item;
} else if (item.fields.length === (best.fields ? best.fields.length : 0)) {
// tie-breaker: keep earlier (tmpl > json > ls)
try { q = (JSON.parse(dataEl.textContent||"{}").q || "").trim(); } catch(_){}
}
}
// If still empty, nothing to do
const q = (best.q || "").trim();
const fields = Array.isArray(best.fields) ? best.fields.filter(Boolean) : [];
if (!q || !fields.length) { ran = true; return; }
// localStorage fallback
if (!q) q = (localStorage.getItem("lastSearchQ") || "").trim();
// 4) Sync LS to the chosen "best" so stale subject-only arrays don't keep overriding
try {
localStorage.setItem('lastSearchQ', q);
localStorage.setItem('lastSearchFields', JSON.stringify(fields));
} catch(_) {}
if (!q) { ran = true; return; }
// 5) Tokenize query (keep quoted phrases; strip wildcards)
// Tokenize like your search: keep quoted phrases; strip wildcards
const tokens = tokenize(q).map(t => t.replaceAll("*","").replaceAll("?","")).filter(Boolean);
if (!tokens.length) { ran = true; return; }
// 6) Highlight only in the fields that were actually selected
for (const f of fields) {
const sel = FIELD_TO_SELECTOR[f];
if (!sel) continue;
// Highlight across ALL selectors
for (const sel of ALL_SELECTORS) {
const container = document.querySelector(sel);
if (!container) continue;
for (const tok of tokens) highlightAll(container, tok);
@ -564,7 +530,7 @@ function showToast(message, duration = 3000) {
ran = true;
}
// --- helpers ---
// ---- helpers ----
function tokenize(s) {
const out = [];
let i = 0, buf = "", inQ = false;
@ -590,6 +556,8 @@ function showToast(message, duration = 3000) {
function highlightAll(root, needle) {
if (!needle) return;
const re = new RegExp(escapeRegExp(needle), "gi");
// Snapshot text nodes first to avoid modifying while walking
const nodes = [];
const walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT, null, false);
while (walker.nextNode()) nodes.push(walker.currentNode);
@ -603,7 +571,7 @@ function showToast(message, duration = 3000) {
text.replace(re, (m, idx) => {
if (idx > lastIndex) frag.appendChild(document.createTextNode(text.slice(lastIndex, idx)));
const mark = document.createElement("mark");
mark.className = "mark-hit";
mark.className = "mark-hit"; // uses your existing gray style
mark.textContent = m;
frag.appendChild(mark);
lastIndex = idx + m.length;
@ -623,4 +591,5 @@ function showToast(message, duration = 3000) {
{% endblock %}