Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

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
                 objects = {},
                 components = {},
                 componentsChildComponents = {},
+                componentsElements = {},
                 doc,
                 script,
                 self = this;
@@ -54,6 +55,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
                     
                 if (component) {
                     label = self._generateLabelForComponent(component, Object.keys(components));
+                    componentsElements[label] = component._element;
                     component._element = targetNode;
                     components[label] = component;
                     componentsChildComponents[label] = component.childComponents;
@@ -91,6 +93,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
             this._ownerSerialization = serializer.serialize(components);
             for (var label in components) {
                 components[label].childComponents = componentsChildComponents[label];
+                components[label]._element = componentsElements[label];
             }
             components = componentsChildComponents = null;
             this._externalObjects = serializer.getExternalObjects();