From ae9dba60c4bbb327b402c500cc042922a954de74 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Mon, 28 Nov 2022 20:25:47 -0400 Subject: chronology tweaks & html.onlyIfContent bugfix --- src/page/album.js | 58 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) (limited to 'src/page/album.js') diff --git a/src/page/album.js b/src/page/album.js index 741fcab..cb512e8 100644 --- a/src/page/album.js +++ b/src/page/album.js @@ -580,8 +580,6 @@ export function generateAlbumChronologyLinks(album, currentTrack, { generateChronologyLinks, html, }) { - const isTrackPage = !!currentTrack; - return html.tag( 'div', { @@ -589,34 +587,38 @@ export function generateAlbumChronologyLinks(album, currentTrack, { class: 'nav-chronology-links', }, [ - isTrackPage && - generateChronologyLinks(currentTrack, { - contribKey: 'artistContribs', - getThings: (artist) => [ - ...artist.tracksAsArtist, - ...artist.tracksAsContributor, - ], - headingString: 'misc.chronology.heading.track', - }), + ...html.fragment( + currentTrack && [ + ...html.fragment( + generateChronologyLinks(currentTrack, { + contribKey: 'artistContribs', + getThings: (artist) => [ + ...artist.tracksAsArtist, + ...artist.tracksAsContributor, + ], + headingString: 'misc.chronology.heading.track', + })), - isTrackPage && - generateChronologyLinks(currentTrack, { - contribKey: 'contributorContribs', + ...html.fragment( + generateChronologyLinks(currentTrack, { + contribKey: 'contributorContribs', + getThings: (artist) => [ + ...artist.tracksAsArtist, + ...artist.tracksAsContributor, + ], + headingString: 'misc.chronology.heading.track', + })), + ]), + + ...html.fragment( + generateChronologyLinks(currentTrack || album, { + contribKey: 'coverArtistContribs', + dateKey: 'coverArtDate', getThings: (artist) => [ - ...artist.tracksAsArtist, - ...artist.tracksAsContributor, + ...artist.albumsAsCoverArtist, + ...artist.tracksAsCoverArtist, ], - headingString: 'misc.chronology.heading.track', - }), - - generateChronologyLinks(currentTrack || album, { - contribKey: 'coverArtistContribs', - dateKey: 'coverArtDate', - getThings: (artist) => [ - ...artist.albumsAsCoverArtist, - ...artist.tracksAsCoverArtist, - ], - headingString: 'misc.chronology.heading.coverArt', - }), + headingString: 'misc.chronology.heading.coverArt', + })), ]); } -- cgit 1.3.0-6-gf8a5