aboutsummaryrefslogtreecommitdiff
path: root/node_modules/tools
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-04 10:37:29 -0700
committerPushkar Joshi2012-06-04 10:37:29 -0700
commitf1d75e5b29661abc4e173adc1f9de2e0cd91df83 (patch)
tree796931014054ad6b0647854183f632ffd72ed9ee /node_modules/tools
parent06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff)
parentc1ec69879028220b0c3f11ad6e24035bf527802c (diff)
downloadninja-f1d75e5b29661abc4e173adc1f9de2e0cd91df83.tar.gz
Merge branch 'master' into pentool
Conflicts: js/tools/PenTool.js
Diffstat (limited to 'node_modules/tools')
-rwxr-xr-xnode_modules/tools/template/template-creator.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/node_modules/tools/template/template-creator.js b/node_modules/tools/template/template-creator.js
index c5d3cffd..646c4171 100755
--- a/node_modules/tools/template/template-creator.js
+++ b/node_modules/tools/template/template-creator.js
@@ -57,6 +57,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
57 component._element = targetNode; 57 component._element = targetNode;
58 components[label] = component; 58 components[label] = component;
59 componentsChildComponents[label] = component.childComponents; 59 componentsChildComponents[label] = component.childComponents;
60 component._element.setAttribute('data-ninja-node', 'true');
60 delete component.childComponents; 61 delete component.childComponents;
61 } else { 62 } else {
62 for (var i = 0; (childNode = childNodes[i]); i++) { 63 for (var i = 0; (childNode = childNodes[i]); i++) {