From 35c569ae4adbe2854762019f4b2f530a0f662c48 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Sun, 1 Jan 2023 22:06:11 -0400 Subject: tweaks to transformMultiline --- src/page/homepage.js | 10 +++++++--- src/strings-default.json | 1 + src/upd8.js | 12 ++++++++++-- src/util/find.js | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/page/homepage.js b/src/page/homepage.js index 882daf7..0ae2b9b 100644 --- a/src/page/homepage.js +++ b/src/page/homepage.js @@ -154,8 +154,10 @@ export function writeTargetless({wikiData}) { content: transformMultiline( homepageLayout.sidebarContent - .replace('[[news]]', '__GENERATE_NEWS__') - ) + .replace('[[news]]', '__GENERATE_NEWS__'), + { + thumb: 'medium', + }) .replace('

__GENERATE_NEWS__

', wikiInfo.enableNews ? [ @@ -179,7 +181,9 @@ export function writeTargetless({wikiData}) { link.newsEntry(entry), ]), - transformMultiline(entry.contentShort), + transformMultiline(entry.contentShort, { + thumb: 'medium', + }), entry.contentShort !== entry.content && link.newsEntry(entry, { diff --git a/src/strings-default.json b/src/strings-default.json index e8245d6..f9c1db8 100644 --- a/src/strings-default.json +++ b/src/strings-default.json @@ -157,6 +157,7 @@ "misc.external.patreon": "Patreon", "misc.external.poetryFoundation": "Poetry Foundation", "misc.external.soundcloud": "SoundCloud", + "misc.external.spotify": "Spotify", "misc.external.tumblr": "Tumblr", "misc.external.twitter": "Twitter", "misc.external.wikipedia": "Wikipedia", diff --git a/src/upd8.js b/src/upd8.js index a30b9b7..fad3c7d 100755 --- a/src/upd8.js +++ b/src/upd8.js @@ -212,6 +212,10 @@ const replacerSpec = { find: 'album', link: 'albumCommentary', }, + 'album-gallery': { + find: 'album', + link: 'albumGallery', + }, artist: { find: 'artist', link: 'artist', @@ -392,7 +396,11 @@ function joinLineBreaks(sourceLines) { return outLines; } -function transformMultiline(text, {parseAttributes, transformInline}) { +function transformMultiline(text, { + parseAttributes, + transformInline, + thumb = null, +}) { // Heck yes, HTML magics. text = transformInline(text.trim()); @@ -442,7 +450,7 @@ function transformMultiline(text, {parseAttributes, transformInline}) { img({ lazy: true, link: true, - thumb: 'medium', + thumb, ...parseAttributes(attributes), }) ); diff --git a/src/util/find.js b/src/util/find.js index ed0a680..dcb15b3 100644 --- a/src/util/find.js +++ b/src/util/find.js @@ -114,7 +114,7 @@ function matchTagName(ref, data, quiet) { } const find = { - album: findHelper(['album', 'album-commentary']), + album: findHelper(['album', 'album-commentary', 'album-gallery']), artist: findHelper(['artist', 'artist-gallery']), artTag: findHelper(['tag'], {byName: matchTagName}), flash: findHelper(['flash']), -- cgit 1.3.0-6-gf8a5