« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
path: root/src/content
diff options
context:
space:
mode:
Diffstat (limited to 'src/content')
-rw-r--r--src/content/dependencies/generateContributionList.js2
-rw-r--r--src/content/dependencies/generateReleaseInfoContributionsLine.js4
-rw-r--r--src/content/dependencies/generateReleaseInfoContributionsLineWikiEditsPart.js5
-rw-r--r--src/content/dependencies/linkContribution.js8
4 files changed, 9 insertions, 10 deletions
diff --git a/src/content/dependencies/generateContributionList.js b/src/content/dependencies/generateContributionList.js
index 8e8c5020..d1c3de0f 100644
--- a/src/content/dependencies/generateContributionList.js
+++ b/src/content/dependencies/generateContributionList.js
@@ -20,8 +20,8 @@ export default {
         .map(contributionLink =>
           html.tag('li',
             contributionLink.slots({
+              showAnnotation: true,
               showExternalLinks: true,
-              showContribution: true,
               showChronology: true,
               preventWrapping: false,
               chronologyKind: slots.chronologyKind,
diff --git a/src/content/dependencies/generateReleaseInfoContributionsLine.js b/src/content/dependencies/generateReleaseInfoContributionsLine.js
index ee817f08..195b94f3 100644
--- a/src/content/dependencies/generateReleaseInfoContributionsLine.js
+++ b/src/content/dependencies/generateReleaseInfoContributionsLine.js
@@ -34,7 +34,7 @@ export default {
   }),
 
   slots: {
-    showContribution: {type: 'boolean', default: true},
+    showAnnotation: {type: 'boolean', default: true},
     showExternalLinks: {type: 'boolean', default: true},
     showChronology: {type: 'boolean', default: true},
 
@@ -47,7 +47,7 @@ export default {
       language.formatConjunctionList(
         relations.contributionLinks.map(link =>
           link.slots({
-            showContribution: slots.showContribution,
+            showAnnotation: slots.showAnnotation,
             showExternalLinks: slots.showExternalLinks,
             showChronology: slots.showChronology,
             chronologyKind: slots.chronologyKind,
diff --git a/src/content/dependencies/generateReleaseInfoContributionsLineWikiEditsPart.js b/src/content/dependencies/generateReleaseInfoContributionsLineWikiEditsPart.js
index 37f29b1c..c5c52fa0 100644
--- a/src/content/dependencies/generateReleaseInfoContributionsLineWikiEditsPart.js
+++ b/src/content/dependencies/generateReleaseInfoContributionsLineWikiEditsPart.js
@@ -39,9 +39,8 @@ export default {
                   language.$(capsule, 'editsLine', {
                     artist:
                       link.slots({
-                        showContribution: false,
-                        showExternalLinks: false,
-                        showChronology: false,
+                        showAnnotation: true,
+                        trimAnnotation: true,
                         preventTooltip: true,
                       }),
                   })),
diff --git a/src/content/dependencies/linkContribution.js b/src/content/dependencies/linkContribution.js
index 67451093..0c5ec8f4 100644
--- a/src/content/dependencies/linkContribution.js
+++ b/src/content/dependencies/linkContribution.js
@@ -19,12 +19,12 @@ export default {
   }),
 
   data: (contribution) => ({
-    contribution: contribution.annotation,
+    annotation: contribution.annotation,
     urls: contribution.artist.urls,
   }),
 
   slots: {
-    showContribution: {type: 'boolean', default: false},
+    showAnnotation: {type: 'boolean', default: false},
     showExternalLinks: {type: 'boolean', default: false},
     showChronology: {type: 'boolean', default: false},
 
@@ -67,10 +67,10 @@ export default {
                   relations.tooltip,
               }));
 
-        if (slots.showContribution && data.contribution) {
+        if (slots.showAnnotation && data.annotation) {
           workingCapsule += '.withContribution';
           workingOptions.contrib =
-            data.contribution;
+            data.annotation;
         }
 
         return language.formatString(workingCapsule, workingOptions);