aboutsummaryrefslogtreecommitdiff
path: root/node_modules/tools
diff options
context:
space:
mode:
authorJon Reid2012-07-03 13:09:08 -0700
committerJon Reid2012-07-03 13:09:08 -0700
commitb05173c892ebbdb5a7568d3904011ab1bfa695a3 (patch)
tree753d879f92e00dae0124f70807c02b6a8a86dc8d /node_modules/tools
parent7e997cac27b4fcb1a30ab53ab5d2114eacfb9222 (diff)
parentd01efeb5918622783f1315136ccdb38f82ad33bb (diff)
downloadninja-b05173c892ebbdb5a7568d3904011ab1bfa695a3.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'node_modules/tools')
-rwxr-xr-xnode_modules/tools/template/template-creator.js3
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();