aboutsummaryrefslogtreecommitdiff
path: root/node_modules/tools/template
diff options
context:
space:
mode:
authorAnanya Sen2012-06-04 10:43:29 -0700
committerAnanya Sen2012-06-04 10:43:29 -0700
commit6fb29883329c9c42a8b406128b92c0e6323a47be (patch)
tree07f46e88bccf9cdb7d4e6818e1b646b0d19f05b9 /node_modules/tools/template
parentcf097ec69e35c07ecae5a105ed5eeb78291c9ac2 (diff)
parentc1ec69879028220b0c3f11ad6e24035bf527802c (diff)
downloadninja-6fb29883329c9c42a8b406128b92c0e6323a47be.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/tools/template')
-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++) {