diff options
| author | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
| commit | bd2c28100f347afc10243c80b8a288746370eee2 (patch) | |
| tree | db507fe0fdbe8e6f98f7d0f022b29c8d5942b4f7 /node_modules/tools | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-bd2c28100f347afc10243c80b8a288746370eee2.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'node_modules/tools')
| -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++) { |