From 2267d8ff2af001f7bf4a6f2a0d59746fe013cccd Mon Sep 17 00:00:00 2001
From: Jonas Dellinger <johnny@johnnycrazy.de>
Date: Sun, 21 May 2017 22:54:39 +0200
Subject: [PATCH] ^1 etc. can now be used by the template AND args

---
 resources/[system]/chat/html/Message.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/resources/[system]/chat/html/Message.js b/resources/[system]/chat/html/Message.js
index 19ea51f..a83e65e 100644
--- a/resources/[system]/chat/html/Message.js
+++ b/resources/[system]/chat/html/Message.js
@@ -5,13 +5,8 @@ Vue.component('message', {
   },
   computed: {
     textEscaped() {
-      let s = '';
-      if (this.template) {
-        s = this.colorize(this.template);
-      } else {
-        s = this.colorize(this.templates[this.templateId]);
-      }
-      return s.replace(/{(\d+)}/g, (match, number) => {
+      let s = this.template ? this.template : this.templates[this.templateId];
+      s = s.replace(/{(\d+)}/g, (match, number) => {
         const argEscaped = this.args[number] != undefined ? this.escape(this.args[number]) : match
         if (number == 0 && this.color) {
           //color is deprecated, use templates or ^1 etc.
@@ -19,6 +14,7 @@ Vue.component('message', {
         }
         return argEscaped;
       });
+      return this.colorize(s);
     },
   },
   methods: {