content, data: generateName, Track.nameText

1 files changed, 11 insertions, 9 deletions

diff --git a/src/content/dependencies/linkThing.js b/src/content/dependencies/linkThing.js
index 7ee42980..7784afe7 100644
--- a/src/content/dependencies/linkThing.js
+++ b/src/content/dependencies/linkThing.js
@@ -11,11 +11,15 @@ export default {
 
     tooltip:
       relation('generateTooltip'),
+
+    name:
+      relation('generateName', thing),
   }),
 
   data: (pathKey, thing) => ({
     name: thing.name,
     nameShort: thing.nameShort ?? thing.shortName,
+    nameText: thing.nameText,
 
     path:
       (pathKey
@@ -66,7 +70,7 @@ export default {
     hash: {type: 'string'},
   },
 
-  generate(data, relations, slots, {html, language}) {
+  generate(data, relations, slots, {html}) {
     const path =
       slots.path ?? data.path;
 
@@ -74,14 +78,12 @@ export default {
     const wrapperAttributes = html.attributes();
 
     const showShortName =
-      (slots.preferShortName
-        ? data.nameShort && data.nameShort !== data.name
-        : false);
+      slots.preferShortName &&
+     !data.nameText &&
+      data.nameShort &&
+      data.nameShort !== data.name;
 
-    const name =
-      (showShortName
-        ? data.nameShort
-        : data.name);
+    const name = relations.name;
 
     const showWikiTooltip =
       (slots.tooltipStyle === 'auto'
@@ -105,7 +107,7 @@ export default {
 
     const content =
       (html.isBlank(slots.content)
-        ? language.sanitize(name)
+        ? name
         : slots.content);
 
     if (slots.color !== false) {