From b76fdc3b5ef0ce800c78014bfb879a5acc0329a9 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Sun, 5 May 2024 13:14:27 -0300 Subject: client: show results from generic search --- src/static/js/client.js | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) (limited to 'src/static/js/client.js') diff --git a/src/static/js/client.js b/src/static/js/client.js index d613bc6a..560a0d36 100644 --- a/src/static/js/client.js +++ b/src/static/js/client.js @@ -3714,19 +3714,40 @@ function showSidebarSearchResults(results) { cssProp(info.resultsContainer, 'display', 'block'); for (const result of flatResults) { - if (result.index !== 'tracks') continue; - info.results.appendChild(generateSidebarSearchTrackResult(result)); + if (result.index !== 'generic') continue; + + const el = generateSidebarSearchResult(result); + if (!el) continue; + + info.results.appendChild(el); } } function generateSidebarSearchResult(result) { + const preparedSlots = { + color: + result.data.color ?? null, + + name: + result.data.name ?? result.data.primaryName ?? null, + + imageSource: + getSearchResultImageSource(result), + }; + switch (result.referenceType) { - case 'track': - return generateSidebarSearchTrackResult(result); + case 'track': { + preparedSlots.href = + openTrack(result.directory); + + break; + } default: return null; } + + return generateSidebarSearchResultTemplate(preparedSlots); } function getSearchResultImageSource(result) { @@ -3757,22 +3778,6 @@ function getSearchResultImageSource(result) { } } -function generateSidebarSearchTrackResult(result) { - return generateSidebarSearchResultTemplate({ - href: - openTrack(result.directory), - - color: - result.data.color, - - name: - result.data.name, - - imageSource: - getSearchResultImageSource(result), - }); -} - function generateSidebarSearchResultTemplate(slots) { const link = document.createElement('a'); link.classList.add('wiki-search-result'); -- cgit 1.3.0-6-gf8a5