aboutsummaryrefslogtreecommitdiff
path: root/node_modules/tools/template
diff options
context:
space:
mode:
authorArmen Kesablyan2012-07-03 12:22:27 -0700
committerArmen Kesablyan2012-07-03 12:22:27 -0700
commit1b3a5532573cbd412a98d33026a34554955c0f04 (patch)
treeedc8f1f7d7628a52af8a41202310ae482bb4d4bd /node_modules/tools/template
parent3d3e37c55e96b74c6c0a2841574fb03814d52999 (diff)
parentbd7586079d77b51334f1c15ffafcc26a679aa9ce (diff)
downloadninja-1b3a5532573cbd412a98d33026a34554955c0f04.tar.gz
Merge branch 'refs/heads/master' into GIO-TextTool
Diffstat (limited to 'node_modules/tools/template')
-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();