From 558f6d15a5351cd446b274ed547d174c5edd12c2 Mon Sep 17 00:00:00 2001 From: Wolfsblvt Date: Thu, 4 Jul 2024 19:05:03 +0200 Subject: [PATCH] Fix trim macro breaking on CRLF --- public/scripts/macros.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/scripts/macros.js b/public/scripts/macros.js index 4d201e3c9..aae0fad17 100644 --- a/public/scripts/macros.js +++ b/public/scripts/macros.js @@ -437,7 +437,7 @@ export function evaluateMacros(content, env) { content = replaceInstructMacros(content, env); content = replaceVariableMacros(content); content = content.replace(/{{newline}}/gi, '\n'); - content = content.replace(/\n*{{trim}}\n*/gi, ''); + content = content.replace(/(?:\r?\n)*{{trim}}(?:\r?\n)*/gi, ''); content = content.replace(/{{noop}}/gi, ''); content = content.replace(/{{input}}/gi, () => String($('#send_textarea').val()));