hrfee
/
jfa-go
mirror of https://github.com/hrfee/jfa-go.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix email editor for other email types

This commit is contained in:
Harvey Tindall 2021-04-22 19:16:41 +01:00
parent d772e43e44
commit 90a2c1f2e7
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
template.go
View File

@ -47,8 +47,7 @@ func templateEmail(content string, variables []string, conditionals []string, va
} }
ifEnd = i - 1 ifEnd = i - 1
if ifTrue { if ifTrue {
b := templateEmail(content[ifStart:ifEnd+1], variables, conditionals, values) out += templateEmail(content[ifStart:ifEnd+1], variables, conditionals, values)
out += b
ifTrue = false ifTrue = false
} }
} else if c == '}' { } else if c == '}' {

9
ts/modules/settings.ts
View File

@ -859,15 +859,14 @@ class EmailEditor {
} }
innerHTML = ''; innerHTML = '';
if (this._templ.conditionals == null || this._templ.conditionals.length == 0) {
this._conditionalsLabel.classList.add("unfocused");
} else {
for (let i = this._templ.conditionals.length-1; i >= 0; i--) { for (let i = this._templ.conditionals.length-1; i >= 0; i--) {
let ci = i % colors.length; let ci = i % colors.length;
innerHTML += '<span class="button ~' + colors[ci] +' !normal mb-1" style="margin-left: 0.25rem; margin-right: 0.25rem;"></span>' innerHTML += '<span class="button ~' + colors[ci] +' !normal mb-1" style="margin-left: 0.25rem; margin-right: 0.25rem;"></span>'
} }
if (this._templ.conditionals.length == 0) {
this._conditionalsLabel.classList.add("unfocused");
} else {
this._conditionalsLabel.classList.remove("unfocused"); this._conditionalsLabel.classList.remove("unfocused");
}
this._conditionals.innerHTML = innerHTML this._conditionals.innerHTML = innerHTML
buttons = this._conditionals.querySelectorAll("span.button") as NodeListOf<HTMLSpanElement>; buttons = this._conditionals.querySelectorAll("span.button") as NodeListOf<HTMLSpanElement>;
for (let i = 0; i < this._templ.conditionals.length; i++) { for (let i = 0; i < this._templ.conditionals.length; i++) {
@ -878,7 +877,7 @@ class EmailEditor {
// this._timeout = setTimeout(this.loadPreview, this._finishInterval); // this._timeout = setTimeout(this.loadPreview, this._finishInterval);
} }
} }
}
window.modals.editor.show(); window.modals.editor.show();
} }
}) })