From 19e41958a4230745a96ef0e0ef3998cdf438aad0 Mon Sep 17 00:00:00 2001
From: Robbie Antenesse <dev@alamantus.com>
Date: Thu, 30 May 2019 11:18:16 -0600
Subject: [PATCH] Make parseReferences() parse its own references

---
 src/js/wordManagement.js | 65 +++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/js/wordManagement.js b/src/js/wordManagement.js
index 2e55dec..88239fa 100644
--- a/src/js/wordManagement.js
+++ b/src/js/wordManagement.js
@@ -46,43 +46,46 @@ export function sortWords(render) {
   }
 }
 
-export function parseReferences(detailsMarkdown, references) {
-  new Set(references).forEach(reference => {
-    let wordToFind = reference.replace(/\{\{|\}\}/g, '');
-    let homonymn = 0;
-    
-    if (wordToFind.includes(':')) {
-      const separator = wordToFind.indexOf(':');
-      homonymn = wordToFind.substr(separator + 1);
-      wordToFind = wordToFind.substring(0, separator);
-      if (homonymn && homonymn.trim()
-        && !isNaN(parseInt(homonymn.trim())) && parseInt(homonymn.trim()) > 0) {
-        homonymn = parseInt(homonymn.trim());
-      } else {
-        homonymn = false;
+export function parseReferences(detailsMarkdown) {
+  const references = detailsMarkdown.match(/\{\{.+?\}\}/g);
+  if (references && Array.isArray(references)) {
+    new Set(references).forEach(reference => {
+      let wordToFind = reference.replace(/\{\{|\}\}/g, '');
+      let homonymn = 0;
+      
+      if (wordToFind.includes(':')) {
+        const separator = wordToFind.indexOf(':');
+        homonymn = wordToFind.substr(separator + 1);
+        wordToFind = wordToFind.substring(0, separator);
+        if (homonymn && homonymn.trim()
+          && !isNaN(parseInt(homonymn.trim())) && parseInt(homonymn.trim()) > 0) {
+          homonymn = parseInt(homonymn.trim());
+        } else {
+          homonymn = false;
+        }
       }
-    }
 
-    let existingWordId = false;
-    const homonymnIndexes = getHomonymnIndexes({ name: wordToFind, wordId: -1 });
+      let existingWordId = false;
+      const homonymnIndexes = getHomonymnIndexes({ name: wordToFind, wordId: -1 });
 
-    if (homonymn !== false && homonymn > 0) {
-      if (typeof homonymnIndexes[homonymn - 1] !== 'undefined') {
-        existingWordId = window.currentDictionary.words[homonymnIndexes[homonymn - 1]].wordId;
+      if (homonymn !== false && homonymn > 0) {
+        if (typeof homonymnIndexes[homonymn - 1] !== 'undefined') {
+          existingWordId = window.currentDictionary.words[homonymnIndexes[homonymn - 1]].wordId;
+        }
+      } else if (homonymn !== false) {
+        existingWordId = wordExists(wordToFind, true);
       }
-    } else if (homonymn !== false) {
-      existingWordId = wordExists(wordToFind, true);
-    }
 
-    if (existingWordId !== false) {
-      if (homonymn < 1 && homonymnIndexes.length > 0) {
-        homonymn = 1;
+      if (existingWordId !== false) {
+        if (homonymn < 1 && homonymnIndexes.length > 0) {
+          homonymn = 1;
+        }
+        const homonymnSubHTML = homonymn > 0 ? '<sub>' + homonymn.toString() + '</sub>' : '';
+        const wordMarkdownLink = `[${wordToFind}${homonymnSubHTML}](#${existingWordId})`;
+        detailsMarkdown = detailsMarkdown.replace(new RegExp(reference, 'g'), wordMarkdownLink);
       }
-      const homonymnSubHTML = homonymn > 0 ? '<sub>' + homonymn.toString() + '</sub>' : '';
-      const wordMarkdownLink = `[${wordToFind}${homonymnSubHTML}](#${existingWordId})`;
-      detailsMarkdown = detailsMarkdown.replace(new RegExp(reference, 'g'), wordMarkdownLink);
-    }
-  });
+    });
+  }
   return detailsMarkdown;
 }