Akkariin/cfx-server-data
1
0
Fork 0
mirror of https://github.com/citizenfx/cfx-server-data.git synced 2026-06-03 21:25:03 +08:00
Code Issues Releases Wiki Activity

^1 etc. can now be used by the template AND args

Browse Source
This commit is contained in:
Jonas Dellinger
2017-05-21 22:54:39 +02:00
Unverified
parent c0ab84c6d6
commit 2267d8ff2a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/[system]/chat/html/Message.js
+3 -7
View File
@@ -5,13 +5,8 @@ Vue.component('message', {
}, },
computed: { computed: {
textEscaped() { textEscaped() {
let s = ''; let s = this.template ? this.template : this.templates[this.templateId];
if (this.template) { s = s.replace(/{(\d+)}/g, (match, number) => {
s = this.colorize(this.template);
} else {
s = this.colorize(this.templates[this.templateId]);
}
return s.replace(/{(\d+)}/g, (match, number) => {
const argEscaped = this.args[number] != undefined ? this.escape(this.args[number]) : match const argEscaped = this.args[number] != undefined ? this.escape(this.args[number]) : match
if (number == 0 && this.color) { if (number == 0 && this.color) {
//color is deprecated, use templates or ^1 etc. //color is deprecated, use templates or ^1 etc.
@@ -19,6 +14,7 @@ Vue.component('message', {
} }
return argEscaped; return argEscaped;
}); });
return this.colorize(s);
}, },
}, },
methods: { methods: {