hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

expand regex for templates, allowing the syntax to be less strict re: whitespace

Browse Source
v1.18.x
psychobunny 11 years ago
parent 3dbcf8112d
commit 5c597ca218
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
public/src/templates.js
Unescape Escape View File

@ -235,11 +235,11 @@
} }
function makeRegex(block) { function makeRegex(block) {
return new RegExp("<!-- BEGIN " + block + " -->[\\s\\S]*<!-- END " + block + " -->", 'g'); return new RegExp("<!--[\\s]*BEGIN " + block + "[\\s]*-->[\\s\\S]*<!--[\\s]*END " + block + "[\\s]*-->", 'g');
} }
function makeConditionalRegex(block) { function makeConditionalRegex(block) {
return new RegExp("<!-- IF " + block + " -->[\\s\\S]*<!-- ENDIF " + block + " -->", 'g'); return new RegExp("<!--[\\s]*IF " + block + "[\\s]*-->[\\s\\S]*<!--[\\s]*ENDIF " + block + "[\\s]*-->", 'g');
} }
function getBlock(regex, block, template) { function getBlock(regex, block, template) {
@ -249,8 +249,8 @@
if (self.blocks && block !== undefined) self.blocks[block] = data[0]; if (self.blocks && block !== undefined) self.blocks[block] = data[0];
data = data[0] data = data[0]
.replace("<!-- BEGIN " + block + " -->", "") .replace("<!--[\\s]*BEGIN " + block + "[\\s]*-->", "")
.replace("<!-- END " + block + " -->", ""); .replace("<!--[\\s]*END " + block + "[\\s]*-->", "");
return data; return data;
} }
@ -309,7 +309,7 @@
var conditionalBlock = conditional.exec(template); var conditionalBlock = conditional.exec(template);
if (conditionalBlock !== null) { if (conditionalBlock !== null) {
conditionalBlock = conditionalBlock[0].split('<!-- ELSE -->'); conditionalBlock = conditionalBlock[0].split(/<!-- ELSE -->/);
if (conditionalBlock[1]) { if (conditionalBlock[1]) {
// there is an else statement // there is an else statement

Write Preview
Loading…
Cancel
Save