From 898969a17b90f9c11af78ad268bb3accbb090654 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Mon, 12 Jun 2023 16:55:42 -0300 Subject: content: misc. code style updates --- src/content/dependencies/generateAdditionalFilesList.js | 10 ++-------- src/content/dependencies/generateAdditionalFilesShortcut.js | 10 ++-------- src/content/dependencies/generateAlbumSocialEmbed.js | 12 ++---------- .../dependencies/generateAlbumSocialEmbedDescription.js | 4 +--- src/content/dependencies/generateAlbumStyleRules.js | 4 +--- src/content/dependencies/generateAlbumTrackList.js | 10 ++-------- src/content/dependencies/generateAlbumTrackListItem.js | 12 ++---------- src/content/dependencies/generateFooterLocalizationLinks.js | 12 ------------ src/content/dependencies/linkAlbumAdditionalFile.js | 4 +--- src/content/dependencies/linkThing.js | 12 ++---------- 10 files changed, 15 insertions(+), 75 deletions(-) diff --git a/src/content/dependencies/generateAdditionalFilesList.js b/src/content/dependencies/generateAdditionalFilesList.js index f698f032..d280a633 100644 --- a/src/content/dependencies/generateAdditionalFilesList.js +++ b/src/content/dependencies/generateAdditionalFilesList.js @@ -25,10 +25,7 @@ function validateFileMapping(v, validateValue) { } export default { - extraDependencies: [ - 'html', - 'language', - ], + extraDependencies: ['html', 'language'], data(additionalFiles) { return { @@ -47,10 +44,7 @@ export default { }, }, - generate(data, slots, { - html, - language, - }) { + generate(data, slots, {html, language}) { if (!slots.fileLinks) { return html.blank(); } diff --git a/src/content/dependencies/generateAdditionalFilesShortcut.js b/src/content/dependencies/generateAdditionalFilesShortcut.js index 7dfe07b3..17280da5 100644 --- a/src/content/dependencies/generateAdditionalFilesShortcut.js +++ b/src/content/dependencies/generateAdditionalFilesShortcut.js @@ -1,10 +1,7 @@ import {empty} from '../../util/sugar.js'; export default { - extraDependencies: [ - 'html', - 'language', - ], + extraDependencies: ['html', 'language'], data(additionalFiles) { return { @@ -12,10 +9,7 @@ export default { }; }, - generate(data, { - html, - language, - }) { + generate(data, {html, language}) { if (empty(data.titles)) { return html.blank(); } diff --git a/src/content/dependencies/generateAlbumSocialEmbed.js b/src/content/dependencies/generateAlbumSocialEmbed.js index 656bd997..079899d3 100644 --- a/src/content/dependencies/generateAlbumSocialEmbed.js +++ b/src/content/dependencies/generateAlbumSocialEmbed.js @@ -5,11 +5,7 @@ export default { 'generateAlbumSocialEmbedDescription', ], - extraDependencies: [ - 'absoluteTo', - 'language', - 'urls', - ], + extraDependencies: ['absoluteTo', 'language', 'urls'], relations(relation, album) { const relations = {}; @@ -44,11 +40,7 @@ export default { return data; }, - generate(data, relations, { - absoluteTo, - language, - urls, - }) { + generate(data, relations, {absoluteTo, language, urls}) { const socialEmbed = {}; if (data.hasHeading) { diff --git a/src/content/dependencies/generateAlbumSocialEmbedDescription.js b/src/content/dependencies/generateAlbumSocialEmbedDescription.js index 5fa67b26..40f696f8 100644 --- a/src/content/dependencies/generateAlbumSocialEmbedDescription.js +++ b/src/content/dependencies/generateAlbumSocialEmbedDescription.js @@ -28,9 +28,7 @@ export default { return data; }, - generate(data, { - language, - }) { + generate(data, {language}) { return language.formatString( 'albumPage.socialEmbed.body' + [ data.hasDuration && '.withDuration', diff --git a/src/content/dependencies/generateAlbumStyleRules.js b/src/content/dependencies/generateAlbumStyleRules.js index c9547836..6a894d71 100644 --- a/src/content/dependencies/generateAlbumStyleRules.js +++ b/src/content/dependencies/generateAlbumStyleRules.js @@ -1,9 +1,7 @@ import {empty} from '../../util/sugar.js'; export default { - extraDependencies: [ - 'to', - ], + extraDependencies: ['to'], data(album) { const data = {}; diff --git a/src/content/dependencies/generateAlbumTrackList.js b/src/content/dependencies/generateAlbumTrackList.js index ce174953..7734cda5 100644 --- a/src/content/dependencies/generateAlbumTrackList.js +++ b/src/content/dependencies/generateAlbumTrackList.js @@ -39,10 +39,7 @@ export default { 'generateAlbumTrackListItem', ], - extraDependencies: [ - 'html', - 'language', - ], + extraDependencies: ['html', 'language'], relations(relation, album) { const relations = {}; @@ -90,10 +87,7 @@ export default { return data; }, - generate(data, relations, { - html, - language, - }) { + generate(data, relations, {html, language}) { const listTag = (data.hasTrackNumbers ? 'ol' : 'ul'); if (relations.itemsByTrackSection) { diff --git a/src/content/dependencies/generateAlbumTrackListItem.js b/src/content/dependencies/generateAlbumTrackListItem.js index fe46153d..0db641bc 100644 --- a/src/content/dependencies/generateAlbumTrackListItem.js +++ b/src/content/dependencies/generateAlbumTrackListItem.js @@ -6,11 +6,7 @@ export default { 'linkTrack', ], - extraDependencies: [ - 'getColors', - 'html', - 'language', - ], + extraDependencies: ['getColors', 'html', 'language'], relations(relation, track) { const relations = {}; @@ -43,11 +39,7 @@ export default { return data; }, - generate(data, relations, { - getColors, - html, - language, - }) { + generate(data, relations, {getColors, html, language}) { const stringOpts = { duration: language.formatDuration(data.duration), track: relations.trackLink, diff --git a/src/content/dependencies/generateFooterLocalizationLinks.js b/src/content/dependencies/generateFooterLocalizationLinks.js index 01b5b209..b4970b17 100644 --- a/src/content/dependencies/generateFooterLocalizationLinks.js +++ b/src/content/dependencies/generateFooterLocalizationLinks.js @@ -42,15 +42,3 @@ export default { })); }, }; - -/* -function unbound_getFooterLocalizationLinks({ - html, - defaultLanguage, - language, - languages, - pagePath, - to, -}) { -} -*/ diff --git a/src/content/dependencies/linkAlbumAdditionalFile.js b/src/content/dependencies/linkAlbumAdditionalFile.js index 27c0ba9c..39e7111e 100644 --- a/src/content/dependencies/linkAlbumAdditionalFile.js +++ b/src/content/dependencies/linkAlbumAdditionalFile.js @@ -1,7 +1,5 @@ export default { - contentDependencies: [ - 'linkTemplate', - ], + contentDependencies: ['linkTemplate'], relations(relation) { return { diff --git a/src/content/dependencies/linkThing.js b/src/content/dependencies/linkThing.js index 03aa9836..4ebf4d76 100644 --- a/src/content/dependencies/linkThing.js +++ b/src/content/dependencies/linkThing.js @@ -1,11 +1,6 @@ export default { - contentDependencies: [ - 'linkTemplate', - ], - - extraDependencies: [ - 'html', - ], + contentDependencies: ['linkTemplate'], + extraDependencies: ['html'], relations(relation) { return { @@ -26,7 +21,6 @@ export default { }, slots: { - // content: relations.linkTemplate.getSlotDescription('content'), content: {type: 'html'}, preferShortName: {type: 'boolean', default: false}, @@ -43,8 +37,6 @@ export default { anchor: {type: 'boolean', default: false}, - // attributes: relations.linkTemplate.getSlotDescription('attributes'), - // hash: relations.linkTemplate.getSlotDescription('hash'), attributes: {validate: v => v.isAttributes}, hash: {type: 'string'}, }, -- cgit 1.3.0-6-gf8a5