diff options
| author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
| commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
| tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /node_modules/tools/template/template-creator.js | |
| parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
| parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
| download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/tools/template/template-creator.js')
| -rwxr-xr-x | node_modules/tools/template/template-creator.js | 1 |
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++) { |