From 1ad3694bf132604eb7044c5a47771637d2b5d56f Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Thu, 7 Jul 2022 02:07:52 -0300
Subject: htmlify: artist, commentary, flash, static, tag

---
 src/page/track.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'src/page/track.js')

diff --git a/src/page/track.js b/src/page/track.js
index 436205b4..258e11d3 100644
--- a/src/page/track.js
+++ b/src/page/track.js
@@ -2,8 +2,6 @@
 
 // Track page specification.
 
-// Imports
-
 import {
   generateAlbumChronologyLinks,
   generateAlbumNavLinks,
@@ -11,8 +9,6 @@ import {
   generateAlbumSidebar,
 } from './album.js';
 
-import * as html from '../util/html.js';
-
 import {bindOpts} from '../util/sugar.js';
 
 import {
@@ -21,8 +17,6 @@ import {
   sortChronologically,
 } from '../util/wiki-data.js';
 
-// Page exports
-
 export function targets({wikiData}) {
   return wikiData.trackData;
 }
@@ -48,7 +42,12 @@ export function write(track, {wikiData}) {
     );
   }
 
-  const unbound_getTrackItem = (track, {getArtistString, link, language}) =>
+  const unbound_getTrackItem = (track, {
+    getArtistString,
+    html,
+    language,
+    link,
+  }) =>
     html.tag('li',
       language.$('trackList.item.withArtists', {
         track: link.track(track),
@@ -159,6 +158,7 @@ export function write(track, {wikiData}) {
       getLinkThemeString,
       getThemeString,
       getTrackCover,
+      html,
       link,
       language,
       transformLyrics,
@@ -168,8 +168,9 @@ export function write(track, {wikiData}) {
     }) => {
       const getTrackItem = bindOpts(unbound_getTrackItem, {
         getArtistString,
-        link,
+        html,
         language,
+        link,
       });
       const cover = getTrackCover(track);
 
@@ -338,8 +339,9 @@ export function write(track, {wikiData}) {
         sidebarLeft: generateAlbumSidebar(album, track, {
           fancifyURL,
           getLinkThemeString,
-          link,
+          html,
           language,
+          link,
           transformMultiline,
           wikiData,
         }),
@@ -369,6 +371,7 @@ export function write(track, {wikiData}) {
 
           content: generateAlbumChronologyLinks(album, track, {
             generateChronologyLinks,
+            html,
           }),
 
           bottomRowContent:
@@ -380,9 +383,10 @@ export function write(track, {wikiData}) {
         },
 
         secondaryNav: generateAlbumSecondaryNav(album, track, {
+          getLinkThemeString,
+          html,
           language,
           link,
-          getLinkThemeString,
         }),
       };
     },
-- 
cgit 1.3.0-6-gf8a5