diff options
author | Kruti Shah | 2012-07-03 15:11:42 -0700 |
---|---|---|
committer | Kruti Shah | 2012-07-03 15:11:42 -0700 |
commit | 63f1d6ddb28e4e8c4d624e764785c58666ebe5cb (patch) | |
tree | 415b48498686136a8d7656a5b836a41de21c97fb /node_modules/tools/template/template-creator.js | |
parent | 14f30bb927f2cb4a27c81fd6ee4e8d9af46b4404 (diff) | |
parent | fcae5717dab144c4d961b94510aed11d01568345 (diff) | |
download | ninja-63f1d6ddb28e4e8c4d624e764785c58666ebe5cb.tar.gz |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-RefactorCode
Diffstat (limited to 'node_modules/tools/template/template-creator.js')
-rwxr-xr-x | node_modules/tools/template/template-creator.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/node_modules/tools/template/template-creator.js b/node_modules/tools/template/template-creator.js index 7cc66093..faf03520 100755 --- a/node_modules/tools/template/template-creator.js +++ b/node_modules/tools/template/template-creator.js | |||
@@ -36,6 +36,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le | |||
36 | objects = {}, | 36 | objects = {}, |
37 | components = {}, | 37 | components = {}, |
38 | componentsChildComponents = {}, | 38 | componentsChildComponents = {}, |
39 | componentsElements = {}, | ||
39 | doc, | 40 | doc, |
40 | script, | 41 | script, |
41 | self = this; | 42 | self = this; |
@@ -54,6 +55,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le | |||
54 | 55 | ||
55 | if (component) { | 56 | if (component) { |
56 | label = self._generateLabelForComponent(component, Object.keys(components)); | 57 | label = self._generateLabelForComponent(component, Object.keys(components)); |
58 | componentsElements[label] = component._element; | ||
57 | component._element = targetNode; | 59 | component._element = targetNode; |
58 | components[label] = component; | 60 | components[label] = component; |
59 | componentsChildComponents[label] = component.childComponents; | 61 | componentsChildComponents[label] = component.childComponents; |
@@ -91,6 +93,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le | |||
91 | this._ownerSerialization = serializer.serialize(components); | 93 | this._ownerSerialization = serializer.serialize(components); |
92 | for (var label in components) { | 94 | for (var label in components) { |
93 | components[label].childComponents = componentsChildComponents[label]; | 95 | components[label].childComponents = componentsChildComponents[label]; |
96 | components[label]._element = componentsElements[label]; | ||
94 | } | 97 | } |
95 | components = componentsChildComponents = null; | 98 | components = componentsChildComponents = null; |
96 | this._externalObjects = serializer.getExternalObjects(); | 99 | this._externalObjects = serializer.getExternalObjects(); |