From c02c0a05457e61eca5f4182a0d35d807bc32edbb Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Sun, 7 Aug 2022 00:14:53 +0100
Subject: [PATCH] fix: progressbar - make sure we are wanting to show when
 doing colours

---
 [esx]/esx_progressbar/nui/js/script.js | 45 +++++++++++++-------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/[esx]/esx_progressbar/nui/js/script.js b/[esx]/esx_progressbar/nui/js/script.js
index ec59f436..de331b93 100644
--- a/[esx]/esx_progressbar/nui/js/script.js
+++ b/[esx]/esx_progressbar/nui/js/script.js
@@ -13,32 +13,31 @@ const codes = {
     "~o~": "orange"
 }
 
-
 $(function () {
     w.addEventListener('message', function(e) {
-        var message = e.data.message
-        const replaceColors = (str, obj) => {
-            let strToReplace = str
-        
-            for (let id in obj) {
-                strToReplace = strToReplace.replace(new RegExp(id, 'g'), obj[id])
-            }
-        
-            return strToReplace
-        }
-        for (color in codes) {
-            if (message.includes(color)) {
-                let objArr = {};
-                objArr[color] = `<span style="color: ${codes[color]}">`;
-                objArr["~s~"] = "</span>";
-    
-                let newStr = replaceColors(message, objArr);
-    
-                message = newStr;
-            }
-        }
-        $(".text").text(message)
         if (e.data.type === "Progressbar") {
+            var message = e.data.message
+            const replaceColors = (str, obj) => {
+                let strToReplace = str
+            
+                for (let id in obj) {
+                    strToReplace = strToReplace.replace(new RegExp(id, 'g'), obj[id])
+                }
+            
+                return strToReplace
+            }
+            for (color in codes) {
+                if (message.includes(color)) {
+                    let objArr = {};
+                    objArr[color] = `<span style="color: ${codes[color]}">`;
+                    objArr["~s~"] = "</span>";
+        
+                    let newStr = replaceColors(message, objArr);
+        
+                    message = newStr;
+                }
+            }
+            $(".text").text(message)
             doc.getElementById("notifyInfo").style.display = "block";
             const start = new Date();
             const maxTime = e.data.length