diff options
author | Jon Reid | 2012-05-15 11:24:53 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/Timeline/Layer.reel/Layer.html | |
parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.html')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 160 |
1 files changed, 23 insertions, 137 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index 915e8b89..c7e7b575 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -11,26 +11,21 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "owner": { | 13 | "owner": { |
14 | "module": "js/panels/Timeline/Layer.reel", | 14 | "prototype": "js/panels/Timeline/Layer.reel", |
15 | "name": "Layer", | ||
16 | "properties": { | 15 | "properties": { |
17 | "element": {"#": "layer"}, | 16 | "element": {"#": "layer"}, |
18 | "styleRepetition" : {"@":"repetition1"}, | 17 | "styleRepetition" : {"@":"repetition1"}, |
19 | "dynamicLayerName" : {"@":"dtext1"}, | 18 | "dynamicLayerName" : {"@":"dtext1"}, |
20 | "dynamicLayerTag" : {"@": "dtext2"}, | 19 | "dynamicLayerTag" : {"@": "dtext2"}, |
21 | "slotStyle" : {"@":"slot1"}, | ||
22 | "mainCollapser" : {"@" : "mainCollapser"}, | 20 | "mainCollapser" : {"@" : "mainCollapser"}, |
23 | "positionCollapser" : {"@" : "positionCollapser"}, | 21 | "positionCollapser" : {"@" : "positionCollapser"}, |
24 | "transformCollapser" : {"@" : "transformCollapser"}, | ||
25 | "styleCollapser" : {"@" : "styleCollapser"}, | 22 | "styleCollapser" : {"@" : "styleCollapser"}, |
26 | "clickerMain" : {"#" : "clicker-main"}, | 23 | "clickerMain" : {"#" : "clicker-main"}, |
27 | "myLabel" : {"#" : "myLabel"}, | 24 | "myLabel" : {"#" : "myLabel"} |
28 | "dragDrop" : {"@" : "DragDrop"} | ||
29 | } | 25 | } |
30 | }, | 26 | }, |
31 | "dtext1" : { | 27 | "dtext1" : { |
32 | "module" : "montage/ui/dynamic-text.reel", | 28 | "prototype" : "montage/ui/dynamic-text.reel", |
33 | "name" : "DynamicText", | ||
34 | "properties" : { | 29 | "properties" : { |
35 | "element" : {"#" : "layer-label-text"} | 30 | "element" : {"#" : "layer-label-text"} |
36 | }, | 31 | }, |
@@ -43,8 +38,7 @@ | |||
43 | } | 38 | } |
44 | }, | 39 | }, |
45 | "dtext2" : { | 40 | "dtext2" : { |
46 | "module" : "montage/ui/dynamic-text.reel", | 41 | "prototype" : "montage/ui/dynamic-text.reel", |
47 | "name" : "DynamicText", | ||
48 | "properties" : { | 42 | "properties" : { |
49 | "element" : {"#" : "layer-tag"} | 43 | "element" : {"#" : "layer-tag"} |
50 | }, | 44 | }, |
@@ -57,8 +51,7 @@ | |||
57 | } | 51 | } |
58 | }, | 52 | }, |
59 | "repetition1": { | 53 | "repetition1": { |
60 | "module": "montage/ui/repetition.reel", | 54 | "prototype": "montage/ui/repetition.reel", |
61 | "name": "Repetition", | ||
62 | "properties": { | 55 | "properties": { |
63 | "element": {"#": "style-container"}, | 56 | "element": {"#": "style-container"}, |
64 | "isSelectionEnabled" : true | 57 | "isSelectionEnabled" : true |
@@ -72,8 +65,7 @@ | |||
72 | } | 65 | } |
73 | }, | 66 | }, |
74 | "style" : { | 67 | "style" : { |
75 | "module" : "js/panels/Timeline/Style.reel", | 68 | "prototype" : "js/panels/Timeline/Style.reel[LayerStyle]", |
76 | "name" : "LayerStyle", | ||
77 | "properties" : { | 69 | "properties" : { |
78 | "element" : {"#" : "layer-style"} | 70 | "element" : {"#" : "layer-style"} |
79 | }, | 71 | }, |
@@ -116,8 +108,7 @@ | |||
116 | } | 108 | } |
117 | }, | 109 | }, |
118 | "dtext_position_x" : { | 110 | "dtext_position_x" : { |
119 | "module": "js/components/hottextunit.reel", | 111 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
120 | "name": "HotTextUnit", | ||
121 | "properties": { | 112 | "properties": { |
122 | "element": {"#": "position-x"}, | 113 | "element": {"#": "position-x"}, |
123 | "maxValue" : 100000, | 114 | "maxValue" : 100000, |
@@ -135,8 +126,7 @@ | |||
135 | } | 126 | } |
136 | }, | 127 | }, |
137 | "dtext_position_y" : { | 128 | "dtext_position_y" : { |
138 | "module": "js/components/hottextunit.reel", | 129 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
139 | "name": "HotTextUnit", | ||
140 | "properties": { | 130 | "properties": { |
141 | "element": {"#": "position-y"}, | 131 | "element": {"#": "position-y"}, |
142 | "maxValue" : 100000, | 132 | "maxValue" : 100000, |
@@ -154,8 +144,7 @@ | |||
154 | } | 144 | } |
155 | }, | 145 | }, |
156 | "dtext_scale_x" : { | 146 | "dtext_scale_x" : { |
157 | "module": "js/components/hottextunit.reel", | 147 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
158 | "name": "HotTextUnit", | ||
159 | "properties": { | 148 | "properties": { |
160 | "element": {"#": "scale-x"}, | 149 | "element": {"#": "scale-x"}, |
161 | "maxValue" : 100, | 150 | "maxValue" : 100, |
@@ -173,8 +162,7 @@ | |||
173 | } | 162 | } |
174 | }, | 163 | }, |
175 | "dtext_scale_y" : { | 164 | "dtext_scale_y" : { |
176 | "module": "js/components/hottextunit.reel", | 165 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
177 | "name": "HotTextUnit", | ||
178 | "properties": { | 166 | "properties": { |
179 | "element": {"#": "scale-y"}, | 167 | "element": {"#": "scale-y"}, |
180 | "maxValue" : 100, | 168 | "maxValue" : 100, |
@@ -191,67 +179,9 @@ | |||
191 | } | 179 | } |
192 | } | 180 | } |
193 | }, | 181 | }, |
194 | "dtext_skew_x" : { | ||
195 | "module": "js/components/hottextunit.reel", | ||
196 | "name": "HotTextUnit", | ||
197 | "properties": { | ||
198 | "element": {"#": "skew-x"}, | ||
199 | "maxValue" : 100, | ||
200 | "minValue" : 0, | ||
201 | "acceptableUnits" : "%", | ||
202 | "units" : "%", | ||
203 | "value" : 0 | ||
204 | }, | ||
205 | "bindings": { | ||
206 | "value": { | ||
207 | "boundObject": {"@": "owner"}, | ||
208 | "boundObjectPropertyPath": "dtextSkewX", | ||
209 | "oneway": false | ||
210 | } | ||
211 | } | ||
212 | }, | ||
213 | "dtext_skew_y" : { | ||
214 | "module": "js/components/hottextunit.reel", | ||
215 | "name": "HotTextUnit", | ||
216 | "properties": { | ||
217 | "element": {"#": "skew-y"}, | ||
218 | "maxValue" : 100, | ||
219 | "minValue" : 0, | ||
220 | "acceptableUnits" : "%", | ||
221 | "units" : "%", | ||
222 | "value" : 0 | ||
223 | }, | ||
224 | "bindings": { | ||
225 | "value": { | ||
226 | "boundObject": {"@": "owner"}, | ||
227 | "boundObjectPropertyPath": "dtextSkewY", | ||
228 | "oneway": false | ||
229 | } | ||
230 | } | ||
231 | }, | ||
232 | "dtext_rotate" : { | ||
233 | "module": "js/components/hottextunit.reel", | ||
234 | "name": "HotTextUnit", | ||
235 | "properties": { | ||
236 | "element": {"#": "rotation"}, | ||
237 | "maxValue" : 360, | ||
238 | "minValue" : -360, | ||
239 | "acceptableUnits" : "degrees", | ||
240 | "units" : "degrees", | ||
241 | "value" : 0 | ||
242 | }, | ||
243 | "bindings": { | ||
244 | "value": { | ||
245 | "boundObject": {"@": "owner"}, | ||
246 | "boundObjectPropertyPath": "dtextRotate", | ||
247 | "oneway": false | ||
248 | } | ||
249 | } | ||
250 | }, | ||
251 | 182 | ||
252 | "mainCollapser" : { | 183 | "mainCollapser" : { |
253 | "module" : "js/panels/timeline/Collapser.js", | 184 | "prototype" : "js/panels/timeline/Collapser", |
254 | "name" : "Collapser", | ||
255 | "properties" : { | 185 | "properties" : { |
256 | "element" : {"#" : "content-main"}, | 186 | "element" : {"#" : "content-main"}, |
257 | "myContent" : {"#" : "content-main"}, | 187 | "myContent" : {"#" : "content-main"}, |
@@ -271,8 +201,7 @@ | |||
271 | }, | 201 | }, |
272 | 202 | ||
273 | "positionCollapser" : { | 203 | "positionCollapser" : { |
274 | "module" : "js/panels/timeline/Collapser.js", | 204 |