diff options
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.html')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 147 |
1 files changed, 31 insertions, 116 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index 9288d718..3648cbbb 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
@@ -17,12 +17,17 @@ | |||
17 | "styleRepetition" : {"@":"repetition1"}, | 17 | "styleRepetition" : {"@":"repetition1"}, |
18 | "dynamicLayerName" : {"@":"dtext1"}, | 18 | "dynamicLayerName" : {"@":"dtext1"}, |
19 | "dynamicLayerTag" : {"@": "dtext2"}, | 19 | "dynamicLayerTag" : {"@": "dtext2"}, |
20 | "layer_label_text" : {"#": "layer-label-text"}, | ||
20 | "mainCollapser" : {"@" : "mainCollapser"}, | 21 | "mainCollapser" : {"@" : "mainCollapser"}, |
21 | "positionCollapser" : {"@" : "positionCollapser"}, | 22 | "positionCollapser" : {"@" : "positionCollapser"}, |
22 | "transformCollapser" : {"@" : "transformCollapser"}, | ||
23 | "styleCollapser" : {"@" : "styleCollapser"}, | 23 | "styleCollapser" : {"@" : "styleCollapser"}, |
24 | "clickerMain" : {"#" : "clicker-main"}, | 24 | "clickerMain" : {"#" : "clicker-main"}, |
25 | "myLabel" : {"#" : "myLabel"} | 25 | "myLabel" : {"#" : "myLabel"}, |
26 | "leftControl": {"@" : "dtext_position_x"}, | ||
27 | "topControl": {"@" : "dtext_position_y"}, | ||
28 | "widthControl": {"@" : "dtext_scale_x"}, | ||
29 | "heightControl": {"@" : "dtext_scale_y"}, | ||
30 | "styleType":{"@" : "style"} | ||
26 | } | 31 | } |
27 | }, | 32 | }, |
28 | "dtext1" : { | 33 | "dtext1" : { |
@@ -34,7 +39,7 @@ | |||
34 | "value" : { | 39 | "value" : { |
35 | "boundObject" : {"@": "owner"}, | 40 | "boundObject" : {"@": "owner"}, |
36 | "boundObjectPropertyPath" : "layerName", | 41 | "boundObjectPropertyPath" : "layerName", |
37 | "oneway" : false | 42 | "oneway" : true |
38 | } | 43 | } |
39 | } | 44 | } |
40 | }, | 45 | }, |
@@ -105,7 +110,12 @@ | |||
105 | "boundObject" : {"@": "repetition1"}, | 110 | "boundObject" : {"@": "repetition1"}, |
106 | "boundObjectPropertyPath" : "objectAtCurrentIteration.ruleTweener", | 111 | "boundObjectPropertyPath" : "objectAtCurrentIteration.ruleTweener", |
107 | "oneway" : false | 112 | "oneway" : false |
108 | } | 113 | }, |
114 | "colorelement" : { | ||
115 | "boundObject" : {"@": "repetition1"}, | ||
116 | "boundObjectPropertyPath" : "objectAtCurrentIteration.colorelement", | ||
117 | "oneway" : false | ||
118 | } | ||
109 | } | 119 | } |
110 | }, | 120 | }, |
111 | "dtext_position_x" : { | 121 | "dtext_position_x" : { |
@@ -148,10 +158,10 @@ | |||
148 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 158 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
149 | "properties": { | 159 | "properties": { |
150 | "element": {"#": "scale-x"}, | 160 | "element": {"#": "scale-x"}, |
151 | "maxValue" : 100, | 161 | "maxValue" : 100000, |
152 | "minValue" : 0, | 162 | "minValue" : -100000, |
153 | "acceptableUnits" : "%", | 163 | "acceptableUnits" : "px", |
154 | "units" : "%", | 164 | "units" : "px", |
155 | "value" : 0 | 165 | "value" : 0 |
156 | }, | 166 | }, |
157 | "bindings": { | 167 | "bindings": { |
@@ -166,10 +176,10 @@ | |||
166 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 176 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
167 | "properties": { | 177 | "properties": { |
168 | "element": {"#": "scale-y"}, | 178 | "element": {"#": "scale-y"}, |
169 | "maxValue" : 100, | 179 | "maxValue" : 100000, |
170 | "minValue" : 0, | 180 | "minValue" : -100000, |
171 | "acceptableUnits" : "%", | 181 | "acceptableUnits" : "px", |
172 | "units" : "%", | 182 | "units" : "px", |
173 | "value" : 0 | 183 | "value" : 0 |
174 | }, | 184 | }, |
175 | "bindings": { | 185 | "bindings": { |
@@ -180,60 +190,6 @@ | |||
180 | } | 190 | } |
181 | } | 191 | } |
182 | }, | 192 | }, |
183 | "dtext_skew_x" : { | ||
184 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | ||
185 | "properties": { | ||
186 | "element": {"#": "skew-x"}, | ||
187 | "maxValue" : 100, | ||
188 | "minValue" : 0, | ||
189 | "acceptableUnits" : "%", | ||
190 | "units" : "%", | ||
191 | "value" : 0 | ||
192 | }, | ||
193 | "bindings": { | ||
194 | "value": { | ||
195 | "boundObject": {"@": "owner"}, | ||
196 | "boundObjectPropertyPath": "dtextSkewX", | ||
197 | "oneway": false | ||
198 | } | ||
199 | } | ||
200 | }, | ||
201 | "dtext_skew_y" : { | ||
202 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | ||
203 | "properties": { | ||
204 | "element": {"#": "skew-y"}, | ||
205 | "maxValue" : 100, | ||
206 | "minValue" : 0, | ||
207 | "acceptableUnits" : "%", | ||
208 | "units" : "%", | ||
209 | "value" : 0 | ||
210 | }, | ||
211 | "bindings": { | ||
212 | "value": { | ||
213 | "boundObject": {"@": "owner"}, | ||
214 | "boundObjectPropertyPath": "dtextSkewY", | ||
215 | "oneway": false | ||
216 | } | ||
217 | } | ||
218 | }, | ||
219 | "dtext_rotate" : { | ||
220 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | ||
221 | "properties": { | ||
222 | "element": {"#": "rotation"}, | ||
223 | "maxValue" : 360, | ||
224 | "minValue" : -360, | ||
225 | "acceptableUnits" : "degrees", | ||
226 | "units" : "degrees", | ||
227 | "value" : 0 | ||
228 | }, | ||
229 | "bindings": { | ||
230 | "value": { | ||
231 | "boundObject": {"@": "owner"}, | ||
232 | "boundObjectPropertyPath": "dtextRotate", | ||
233 | "oneway": false | ||
234 | } | ||
235 | } | ||
236 | }, | ||
237 | 193 | ||
238 | "mainCollapser" : { | 194 | "mainCollapser" : { |
239 | "prototype" : "js/panels/timeline/Collapser", | 195 | "prototype" : "js/panels/timeline/Collapser", |
@@ -275,26 +231,6 @@ | |||
275 | } | 231 | } |
276 | }, | 232 | }, |
277 | 233 | ||
278 | "transformCollapser" : { | ||
279 | "prototype" : "js/panels/timeline/Collapser", | ||
280 | "properties" : { | ||
281 | "element" : {"#" : "content-transform"}, | ||
282 | "myContent" : {"#":"content-transform"}, | ||
283 | "contentHeight" : 60, | ||
284 | "isLabelClickable" : true, | ||
285 | "clicker" : {"#" : "clicker-transform"}, | ||
286 | "isCollapsed" : true, | ||
287 | "isAnimated" : true | ||
288 | }, | ||
289 | "bindings" : { | ||
290 | "isToggling" : { | ||
291 | "boundObject" : {"@" : "owner" }, | ||
292 | "boundObjectPropertyPath" : "isTransformCollapsed", | ||
293 | "oneway" : false | ||
294 | } | ||
295 | } | ||
296 | }, | ||
297 | |||
298 | "styleCollapser" : { | 234 | "styleCollapser" : { |
299 | "prototype" : "js/panels/timeline/Collapser", | 235 | "prototype" : "js/panels/timeline/Collapser", |
300 | "properties" : { | 236 | "properties" : { |
@@ -331,7 +267,7 @@ | |||
331 | </div> | 267 | </div> |
332 | <div class="collapsible-content content-layer collapsible-collapsed" data-montage-id="content-main"> | 268 | <div class="collapsible-content content-layer collapsible-collapsed" data-montage-id="content-main"> |
333 | <div class="label-position"> | 269 | <div class="label-position"> |
334 | <span class="collapsible-label">Position</span> | 270 | <span class="collapsible-label">Position and Size</span> |
335 | <span class="collapsible-clicker clicker-position collapsible-collapsed" data-montage-id="clicker-position"></span> | 271 | <span class="collapsible-clicker clicker-position collapsible-collapsed" data-montage-id="clicker-position"></span> |
336 | </div> | 272 | </div> |
337 | <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position"> | 273 | <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position"> |
@@ -344,37 +280,16 @@ | |||
344 | <div class="cell-property">Top</div> | 280 | <div class="cell-property">Top</div> |
345 | <div class="cell-value"><div data-montage-id="position-y"></div></div> | 281 | <div class="cell-value"><div data-montage-id="position-y"></div></div> |
346 | </div> | 282 | </div> |
283 | <div class="container-row"> | ||
284 | <div class="cell-property">Width</div> | ||
285 | <div class="cell-value"><div data-montage-id="scale-x"></div></div> | ||
286 | </div> | ||
287 | <div class="container-row"> | ||
288 | <div class="cell-property">Height</div> | ||
289 | <div class="cell-value"><div data-montage-id="scale-y"></div></div> | ||
290 | </div> | ||
347 | </div> | 291 | </div> |
348 | </div> | 292 | </div> |
349 | <div class="label-transform"> |