From 10e4a95c7c1de6939146fee77248092f77072729 Mon Sep 17 00:00:00 2001
From: bingus_violet <violet@violets-purgatory.dev>
Date: Tue, 18 Jun 2024 07:26:18 -0500
Subject: [PATCH] Fix overlapping highlights

---
 constants.json |  3 ---
 pageUpdater.js | 12 ++++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/constants.json b/constants.json
index 0e7c327..1fe2312 100644
--- a/constants.json
+++ b/constants.json
@@ -164,9 +164,6 @@
         "Teto Territory": {
             "color": "rgb(255, 100, 100)",
             "caseInsensitive": true
-        },
-        "Services": {
-
         },
         "Teto": {
             "color": "rgb(255, 100, 100)",
diff --git a/pageUpdater.js b/pageUpdater.js
index 009d285..ac1604f 100644
--- a/pageUpdater.js
+++ b/pageUpdater.js
@@ -171,16 +171,20 @@ function converter(html) {
 
                         var endContent = element.content.substring(termIndex + termKey.length, spanEnd)
     
-                        var spanStart = element.content.substring(0, termIndex).lastIndexOf(" ")
-                        var startContent = element.content.substring(spanStart, termIndex)
+                        var spanStart = element.content.substring(0, termIndex).lastIndexOf(" ") + 1
+                        var startContent = element.content.substring(spanStart - 1, termIndex)
                         
-                        var style = ""
+                        var style = termProps.style || ""
 
                         if (termProps.color) {
                             style += `color: ${termProps.color};`
                         }
 
-                        var replacement = `<span style="${style}">${startContent + highTable[index] + endContent}</span>`
+                        if (style.length > 2) {
+                            style = `style="${style}"`
+                        }
+
+                        var replacement = `<span ${style}>${startContent + highTable[index] + endContent}</span>`
                         
                         element.content = element.content.substring(0, spanStart) + replacement + element.content.substring(spanEnd)
                     }