jason/ThunderAI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

various improvements

Browse source
This commit is contained in:
mic 2024-10-13 22:29:33 +02:00
parent 0b09e2e3a5
commit 1e20dc3ba5
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
js/mzta-placeholders.js
View file

@ -55,9 +55,6 @@ export async function getPlaceholders(onlyEnabled = false){
}else{ // order only if we are not filtering, the filtering is for the automplete and we are ordering there after i18n }else{ // order only if we are not filtering, the filtering is for the automplete and we are ordering there after i18n
output.sort((a, b) => a.id.localeCompare(b.id)); output.sort((a, b) => a.id.localeCompare(b.id));
} }
for(let i=1; i<=output.length; i++){
output[i-1].idnum = i;
}
// console.log('>>>>>>>>>>>> getPlaceholders output: ' + JSON.stringify(output)); // console.log('>>>>>>>>>>>> getPlaceholders output: ' + JSON.stringify(output));
return output; return output;
} }
@ -112,15 +109,20 @@ export async function setCustomPlaceholders(placeholders) {
export const placeholdersUtils = { export const placeholdersUtils = {
extractPlaceholders(text) { async extractPlaceholders(text) {
// Regular expression to match patterns like {%...%} // Regular expression to match patterns like {%...%}
const regex = /{%\s*(.*?)\s*%}/g; const regex = /{%\s*(.*?)\s*%}/g;
let matches = []; let matches = [];
let match; let match;
let activePHs = await getPlaceholders(true);
// Use exec to find all matches // Use exec to find all matches
while ((match = regex.exec(text)) !== null) { while ((match = regex.exec(text)) !== null) {
matches.push(match[1]); // Push only the string inside {%...%} const foundPH = activePHs.find(ph => ph.id === match[1].trim());
if (foundPH) {
matches.push(foundPH);
}
} }
return matches; return matches;
@ -130,7 +132,7 @@ export const placeholdersUtils = {
// Regular expression to match patterns like {%...%} // Regular expression to match patterns like {%...%}
return text.replace(/{%\s*(.*?)\s*%}/g, function(match, p1) { return text.replace(/{%\s*(.*?)\s*%}/g, function(match, p1) {
// p1 contains the key inside {% %} // p1 contains the key inside {% %}
return replacements[p1] || match; // Replace if found, otherwise keep the original return replacements[p1] ? "\"" + replacements[p1] + "\"" : match; // Replace if found, otherwise keep the original
}); });
}, },