diff options
author | Kruti Shah | 2012-07-09 11:30:37 -0700 |
---|---|---|
committer | Kruti Shah | 2012-07-09 11:30:37 -0700 |
commit | 35a31845720beb1296dc42a79fa068601dfc52cb (patch) | |
tree | 252ba58a3f2bb9600262c48571cc3dabaee36449 /node_modules/tools | |
parent | b35edd96135bd8c2b500ffee08474bacd17c25ac (diff) | |
parent | 39aa69624e1e3b8598b0242ee6ec436862b67280 (diff) | |
download | ninja-35a31845720beb1296dc42a79fa068601dfc52cb.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'node_modules/tools')
-rwxr-xr-x | node_modules/tools/template/template-creator.js | 37 |
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 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 2 | Copyright (c) 2012, Motorola Mobility, Inc |
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 3 | All Rights Reserved. |
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | BSD License. |
5 | </copyright> */ | 5 | |
6 | Redistribution and use in source and binary forms, with or without | ||
7 | modification, are permitted provided that the following conditions are met: | ||
8 | |||
9 | - Redistributions of source code must retain the above copyright notice, | ||
10 | this list of conditions and the following disclaimer. | ||
11 | - Redistributions in binary form must reproduce the above copyright | ||
12 | notice, this list of conditions and the following disclaimer in the | ||
13 | documentation and/or other materials provided with the distribution. | ||
14 | - Neither the name of Motorola Mobility nor the names of its contributors | ||
15 | may be used to endorse or promote products derived from this software | ||
16 | without specific prior written permission. | ||
17 | |||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
25 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
26 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
27 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
28 | POSSIBILITY OF SUCH DAMAGE. | ||
29 | </copyright> */ | ||
6 | /** | 30 | /** |
7 | @module montage/tools/template/template-creator | 31 | @module montage/tools/template/template-creator |
8 | @requires montage/ui/template | 32 | @requires montage/ui/template |
@@ -36,6 +60,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le | |||
36 | objects = {}, | 60 | objects = {}, |
37 | components = {}, | 61 | components = {}, |
38 | componentsChildComponents = {}, | 62 | componentsChildComponents = {}, |
63 | componentsElements = {}, | ||
39 | doc, | 64 | doc, |
40 | script, | 65 | script, |
41 | self = this; | 66 | self = this; |
@@ -54,6 +79,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le | |||
54 | 79 | ||
55 | if (component) { | 80 | if (component) { |
56 | label = self._generateLabelForComponent(component, Object.keys(components)); | 81 | label = self._generateLabelForComponent(component, Object.keys(components)); |
82 | componentsElements[label] = component._element; | ||
57 | component._element = targetNode; | 83 | component._element = targetNode; |
58 | components[label] = component; | 84 | components[label] = component; |
59 | componentsChildComponents[label] = component.childComponents; | 85 | componentsChildComponents[label] = component.childComponents; |
@@ -91,6 +117,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le | |||
91 | this._ownerSerialization = serializer.serialize(components); | 117 | this._ownerSerialization = serializer.serialize(components); |
92 | for (var label in components) { | 118 | for (var label in components) { |
93 | components[label].childComponents = componentsChildComponents[label]; | 119 | components[label].childComponents = componentsChildComponents[label]; |
120 | components[label]._element = componentsElements[label]; | ||
94 | } | 121 | } |
95 | components = componentsChildComponents = null; | 122 | components = componentsChildComponents = null; |
96 | this._externalObjects = serializer.getExternalObjects(); | 123 | this._externalObjects = serializer.getExternalObjects(); |
@@ -121,4 +148,4 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le | |||
121 | return componentName + index; | 148 | return componentName + index; |
122 | } | 149 | } |
123 | }}, | 150 | }}, |
124 | }); \ No newline at end of file | 151 | }); |