From 83325d6034a1f7ee1d861b8179c0edb9a7e0537d Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Sun, 2 Jul 2023 15:52:57 -0300 Subject: generateAlbumTrackList: don't hard-code content heading html --- src/content/dependencies/generateAlbumTrackList.js | 37 ++++++++++++---------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'src/content') diff --git a/src/content/dependencies/generateAlbumTrackList.js b/src/content/dependencies/generateAlbumTrackList.js index 1c0d37b3..b222799b 100644 --- a/src/content/dependencies/generateAlbumTrackList.js +++ b/src/content/dependencies/generateAlbumTrackList.js @@ -35,10 +35,7 @@ function getDisplayMode(album) { } export default { - contentDependencies: [ - 'generateAlbumTrackListItem', - ], - + contentDependencies: ['generateAlbumTrackListItem', 'generateContentHeading'], extraDependencies: ['html', 'language'], query(album) { @@ -52,10 +49,15 @@ export default { switch (query.displayMode) { case 'trackSections': + relations.trackSectionHeadings = + album.trackSections.map(() => + relation('generateContentHeading')); + relations.itemsByTrackSection = album.trackSections.map(section => section.tracks.map(track => relation('generateAlbumTrackListItem', track, album))); + break; case 'tracks': @@ -103,23 +105,26 @@ export default { case 'trackSections': return html.tag('dl', {class: 'album-group-list'}, stitchArrays({ + heading: relations.trackSectionHeadings, + items: relations.itemsByTrackSection, info: data.trackSectionInfo, - item: relations.itemsByTrackSection, - }).map(({info, item}) => [ - html.tag('dt', - {class: 'content-heading', tabindex: '0'}, - language.$('trackList.section.withDuration', { - section: info.name, - duration: - language.formatDuration(info.duration, { - approximate: info.durationApproximate, - }), - })), + }).map(({heading, items, info}) => [ + heading.slots({ + tag: 'dt', + title: + language.$('trackList.section.withDuration', { + section: info.name, + duration: + language.formatDuration(info.duration, { + approximate: info.durationApproximate, + }), + }), + }), html.tag('dd', html.tag(listTag, data.hasTrackNumbers ? {start: info.startIndex + 1} : {}, - item)), + items)), ])); case 'tracks': -- cgit 1.3.0-6-gf8a5