Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-17 11:11:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #123, parse object properties in template outside of namespace

Browse Source
This commit is contained in:
psychobunny
2013-12-08 13:50:11 -05:00
parent a34ed92fac
commit b5e37a6ce8
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/src/templates.js
View File

@@ -300,14 +300,7 @@
namespace = namespace.replace(d + '.', ''); namespace = namespace.replace(d + '.', '');
template = setBlock(regex, result, template); template = setBlock(regex, result, template);
} else if (data[d] instanceof Object) { } else if (data[d] instanceof Object) {
namespace += d + '.'; template = parse(data[d], d + '.', template);
regex = makeRegex(d),
block = getBlock(regex, namespace, template)
if (block == null) continue;
block = parse(data[d], namespace, block);
template = setBlock(regex, block, template);
} else { } else {
function checkConditional(key, value) { function checkConditional(key, value) {
var conditional = makeConditionalRegex(key), var conditional = makeConditionalRegex(key),
@@ -352,6 +345,7 @@
if (namespace) { if (namespace) {
var regex = new RegExp("{" + namespace + "[\\s\\S]*?}", 'g'); var regex = new RegExp("{" + namespace + "[\\s\\S]*?}", 'g');
template = template.replace(regex, ''); template = template.replace(regex, '');
namespace = '';
} }
// clean up all undefined conditionals // clean up all undefined conditionals