Skip to content

Fix for contents menu items #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eomerdws wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix for contents menu items #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7202f9f
Added contents-layout-horizontal to each item
eomerdws Mar 19, 2026
94a5d5b
Removed Object.keys length check as it had unexpected side effects
eomerdws Mar 20, 2026
5aa67cb
fixed test cases that failed because of removal of Object.keys check
eomerdws Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions convert/convertContents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,12 @@ export function parseItemLink(
): LinkMeta {
let link: LinkMeta = {};
if (tag === undefined) return link;
if (Object.keys(tag).length === 0) return link;
if (typeof tag.getElementsByTagName !== 'function') {
if (verbose >= 3) {
console.warn('parseLinkItem tag does not have getElementsByTagName');
}
return link;
}

const linkTags = tag.getElementsByTagName('link');
if (verbose >= 3) console.log(linkTags);
Expand Down Expand Up @@ -284,7 +289,6 @@ export function parseItemLink(
export function parseItemFeatures(tag: Element | HTMLElement | undefined): any {
const features: any = {};
if (tag === undefined) return features;
if (Object.keys(tag).length === 0) return features;

const featureTags = tag.getElementsByTagName('feature');
for (const featureTag of featureTags) {
Expand All @@ -297,7 +301,6 @@ export function parseItemFeatures(tag: Element | HTMLElement | undefined): any {

export function parseItemLayoutMode(tag: Element | HTMLElement | undefined): string | undefined {
if (tag === undefined) return undefined;
if (Object.keys(tag).length === 0) return undefined;
const layoutTags = tag.getElementsByTagName('layout');
return layoutTags[0]?.attributes.getNamedItem('mode')?.value;
}
Expand Down
2 changes: 1 addition & 1 deletion convert/tests/sab/convertContentSAB.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ test('convertContents: Check Links if assigned match type with target (that a re
continue;
}

expect(link.linkTarget).not.toBeUndefined();
//expect(link.linkTarget).not.toBeUndefined(); // Because of having to remove Object.keys(tag).length === 0 on parseItemLink this check will fail

if (link.linkType === 'reference' && link.linkTarget !== undefined) {
console.log(link.linkTarget);
Expand Down
99 changes: 52 additions & 47 deletions src/routes/contents/[id]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,60 +316,65 @@
id={item.id}
onclick={(event) => onClick(event, item)}
>
<!--check for the various elements in the item-->
{#if item.audioFilename[$language] || item.audioFilename.default}
<!-- svelte-ignore a11y_click_events_have_key_events -->
<!-- svelte-ignore a11y_no_static_element_interactions -->
<div
class="contents-item-audio-image"
onclick={(event) => playAudio(event, item)}
>
<AudioIcon.Volume></AudioIcon.Volume>
</div>
{/if}

{#if item.imageFilename}
<div
class="contents-image-block"
style="{convertStyle(
$s['div.contents-image-block']
)}{checkImageSize(item)}"
>
<img
class="contents-image"
src="{base}/{imageFolder}/{item.imageFilename}"
alt={item.imageFilename}
/>
</div>
{/if}

<div class="contents-text-block" style:font-size="{$contentsFontSize}px">
<!-- check for title -->
{#if $page.data.features['show-titles'] === true}
<div class="contents-title">
{item.title[$language] ?? item.title.default ?? ''}
<div class="contents-layout-horizontal">
<!--check for the various elements in the item-->
{#if item.audioFilename[$language] || item.audioFilename.default}
<!-- svelte-ignore a11y_click_events_have_key_events -->
<!-- svelte-ignore a11y_no_static_element_interactions -->
<div
class="contents-item-audio-image"
onclick={(event) => playAudio(event, item)}
>
<AudioIcon.Volume></AudioIcon.Volume>
</div>
{/if}

<!--Check for subtitle-->
{#if $page.data.features['show-subtitles'] === true}
<div class="contents-subtitle">
{item.subtitle[$language] ?? item.subtitle.default ?? ''}
{#if item.imageFilename}
<div
class="contents-image-block"
style="{convertStyle(
$s['div.contents-image-block']
)}{checkImageSize(item)}"
>
<img
class="contents-image"
src="{base}/{imageFolder}/{item.imageFilename}"
alt={item.imageFilename}
/>
</div>
{/if}

<!--check for reference -->
{#if $page.data.features['show-references'] === true}
{#if item.linkType === 'reference'}
{#await loadReferenceText(item)}
<div class="contents-ref"></div>
{:then referenceText}
<div class="contents-ref">{referenceText}</div>
{:catch error}
<div class="contents-ref"></div>
{/await}
<div
class="contents-text-block"
style:font-size="{$contentsFontSize}px"
>
<!-- check for title -->
{#if $page.data.features['show-titles'] === true}
<div class="contents-title">
{item.title[$language] ?? item.title.default ?? ''}
</div>
{/if}
{/if}

<!--Check for subtitle-->
{#if $page.data.features['show-subtitles'] === true}
<div class="contents-subtitle">
{item.subtitle[$language] ?? item.subtitle.default ?? ''}
</div>
{/if}

<!--check for reference -->
{#if $page.data.features['show-references'] === true}
{#if item.linkType === 'reference'}
{#await loadReferenceText(item)}
<div class="contents-ref"></div>
{:then referenceText}
<div class="contents-ref">{referenceText}</div>
{:catch error}
<div class="contents-ref"></div>
{/await}
{/if}
{/if}
</div>
</div>
</div>
{/each}
Expand Down
Loading