From b5e37a6ce8f9d42bf9683e4e8a9771d6119fea73 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sun, 8 Dec 2013 13:50:11 -0500 Subject: [PATCH] fixes #123, parse object properties in template outside of namespace --- public/src/templates.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/public/src/templates.js b/public/src/templates.js index 6a3f13a99e..e629ef08b6 100644 --- a/public/src/templates.js +++ b/public/src/templates.js @@ -300,14 +300,7 @@ namespace = namespace.replace(d + '.', ''); template = setBlock(regex, result, template); } else if (data[d] instanceof Object) { - namespace += d + '.'; - - regex = makeRegex(d), - block = getBlock(regex, namespace, template) - if (block == null) continue; - - block = parse(data[d], namespace, block); - template = setBlock(regex, block, template); + template = parse(data[d], d + '.', template); } else { function checkConditional(key, value) { var conditional = makeConditionalRegex(key), @@ -352,6 +345,7 @@ if (namespace) { var regex = new RegExp("{" + namespace + "[\\s\\S]*?}", 'g'); template = template.replace(regex, ''); + namespace = ''; } // clean up all undefined conditionals