From 7f7cc8dc622757c855276cbd7ee395d404eebf59 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 20 May 2014 13:52:12 -0400
Subject: [PATCH] merging in latest templates.js

---
 public/src/templates.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/src/templates.js b/public/src/templates.js
index 83931fb057..dbce5a5a2f 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -285,6 +285,8 @@
 					template = parseArray(template, obj, key, namespace + key + '.', bind);
 				} else if (obj[key] instanceof Object) {
 					defineParent(obj[key], originalObj);
+					template = checkConditional(template, key, obj[key]);
+					template = checkConditional(template, '!' + key, !obj[key]);
 					template = parse(template, obj[key], bind, namespace + key + '.');
 				} else {
 					template = parseValue(template, namespace + key, obj[key]);