Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

1 files changed, 32 insertions, 5 deletions

diff --git a/node_modules/tools/template/template-creator.js b/node_modules/tools/template/template-creator.js
index 7cc66093..9951fb02 100755
--- a/node_modules/tools/template/template-creator.js
+++ b/node_modules/tools/template/template-creator.js
@@ -1,8 +1,32 @@
 /* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
+Copyright (c) 2012, Motorola Mobility, Inc
+All Rights Reserved.
+BSD License.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+  - Neither the name of Motorola Mobility nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</copyright> */
 /**
     @module montage/tools/template/template-creator
     @requires montage/ui/template
@@ -36,6 +60,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
                 objects = {},
                 components = {},
                 componentsChildComponents = {},
+                componentsElements = {},
                 doc,
                 script,
                 self = this;
@@ -54,6 +79,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 +117,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();
@@ -121,4 +148,4 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
             return componentName + index;
         }
     }},
-});
\ No newline at end of file
+});