Merge pull request #2475 from SillyTavern/fix-trim-macro Fix trim macro breaking on CRLF

03c9e3f16820e63e73292cab350d49da766d1399

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed
Parents: 3918192dee20e9d1a8e6ae25c4a461cc7a1f7648 558f6d15a5351cd446b274ed547d174c5edd12c2
1 files changed, +1 -1Ignore whitespace
public/scripts/macros.js+1 -1
@@ -437,7 +437,7 @@ export function evaluateMacros(content, env) {
437 content = replaceInstructMacros(content, env);437 content = replaceInstructMacros(content, env);
438 content = replaceVariableMacros(content);438 content = replaceVariableMacros(content);
439 content = content.replace(/{{newline}}/gi, '\n');439 content = content.replace(/{{newline}}/gi, '\n');
440 content = content.replace(/\n*{{trim}}\n*/gi, '');440 content = content.replace(/(?:\r?\n)*{{trim}}(?:\r?\n)*/gi, '');
441 content = content.replace(/{{noop}}/gi, '');441 content = content.replace(/{{noop}}/gi, '');
442 content = content.replace(/{{input}}/gi, () => String($('#send_textarea').val()));442 content = content.replace(/{{input}}/gi, () => String($('#send_textarea').val()));
443443