Finish Unnamed Infant feature

wikitree · Jun 1, 2024 · 93e67e0 · 93e67e0
1 parent d98d8bc
commit 93e67e0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 23 deletions.
diff --git a/src/features/unnamed_infant/unnamed_infant.js b/src/features/unnamed_infant/unnamed_infant.js
@@ -13,7 +13,8 @@ shouldInitializeFeature("unnamedInfant").then((result) => {
   }
 });
 
-function doUnnamedInfant() {
+async function doUnnamedInfant() {
+  const options = await getFeatureOptions("unnamedInfant");
   const firstName = $("#mFirstName").val();
   const birthDate = $("#mBirthDate").val();
   const deathDate = $("#mDeathDate").val();
@@ -39,27 +40,35 @@ function doUnnamedInfant() {
         }
       });
 
-      let enhanced = false;
-      const enhancedEditorButton = $("#toggleMarkupColor");
-      if (enhancedEditorButton.attr("value") == "Turn Off Enhanced Editor") {
-        enhancedEditorButton.trigger("click");
-        enhanced = true;
-      }
-      const bioBox = $("#wpTextbox1");
-      const bio = bioBox.val();
-      // Search Biography for Died Young sticker
-      if (!bio.includes(diedYoungWithoutEnd)) {
-        // Find /== ?Biography ?==/ and insert Died Young sticker after it.
-        const bioIndex = bio.search(/== ?Biography ?==/);
-        if (bioIndex != -1) {
-          const bioStart = bio.slice(0, bioIndex + 15);
-          const bioEnd = bio.slice(bioIndex + 15);
-          bioBox.val(bioStart + "\n" + diedYoung + "\n" + bioEnd);
-          message += "<br>Died Young sticker added to Biography";
+      if (options.diedYoung) {
+        let enhanced = false;
+        const enhancedEditorButton = $("#toggleMarkupColor");
+        if (enhancedEditorButton.attr("value") == "Turn Off Enhanced Editor") {
+          enhancedEditorButton.trigger("click");
+          enhanced = true;
+        }
+        const bioBox = $("#wpTextbox1");
+        const bio = bioBox.val();
+        // Search Biography for Died Young sticker
+        if (!bio.includes(diedYoungWithoutEnd)) {
+          // Find /== ?Biography ?==/ and insert Died Young sticker after it.
+          const bioIndex = bio.search(/== ?Biography ?==/);
+          if (bioIndex != -1) {
+            let diedYoungTemplate = diedYoung;
+
+            if (options.diedYoungImage && options.diedYoungImage != "Default") {
+              diedYoungTemplate = `{{Died Young|${options.diedYoungImage}}}`;
+            }
+
+            const bioStart = bio.slice(0, bioIndex + 15);
+            const bioEnd = bio.slice(bioIndex + 15);
+            bioBox.val(bioStart + "\n" + diedYoungTemplate + "\n" + bioEnd);
+            message += "<br>Died Young sticker added to Biography";
+          }
+        }
+        if (enhanced) {
+          enhancedEditorButton.trigger("click");
         }
-      }
-      if (enhanced) {
-        enhancedEditorButton.trigger("click");
       }
     }
     // Show message

diff --git a/src/features/unnamed_infant/unnamed_infant_options.js b/src/features/unnamed_infant/unnamed_infant_options.js
@@ -1,4 +1,3 @@
-import { options } from "yargs";
 import { registerFeature, OptionType } from "../../core/options/options_registry";
 import { isProfileEdit, isProfileAddRelative, isAddUnrelatedPerson } from "../../core/pageType";
 
@@ -15,7 +14,7 @@ registerFeature({
     {
       id: "diedYoung",
       type: OptionType.CHECKBOX,
-      label: "Add Died Young sticker for people who died aged 16 or younger",
+      label: "Add Died Young sticker",
       defaultValue: false,
     },
     {