Akkariin/cfx-server-data
1
0
Fork 0
mirror of https://github.com/citizenfx/cfx-server-data.git synced 2025-02-13 17:53:16 +08:00
Code Issues Releases Wiki Activity

Fixed raw templates being ignored when there is only one arg.

Browse Source 
When there was just one arg and a raw template, the template got swaped out with CONFIG.defaultAltTemplateId
This commit is contained in:
Jonas Dellinger 2017-07-27 19:54:41 +02:00
parent 602753f59e
commit 466149d1ec
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/[system]/chat/html/Message.js
View File

@ -7,6 +7,11 @@ Vue.component('message', {
textEscaped() { textEscaped() {
let s = this.template ? this.template : this.templates[this.templateId]; let s = this.template ? this.template : this.templates[this.templateId];
if (this.template) {
//We disable templateId since we are using a direct raw template
this.templateId = -1;
}
//This hack is required to preserve backwards compatability //This hack is required to preserve backwards compatability
if (this.templateId == CONFIG.defaultTemplateId if (this.templateId == CONFIG.defaultTemplateId
&& this.args.length == 1) { && this.args.length == 1) {