diff options
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 114 | ||||
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 90 | ||||
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 13 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 52 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 19 | ||||
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 4 |
6 files changed, 40 insertions, 252 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index 10334b31..ba7c18c3 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
@@ -20,7 +20,6 @@ | |||
20 | "slotStyle" : {"@":"slot1"}, | 20 | "slotStyle" : {"@":"slot1"}, |
21 | "mainCollapser" : {"@" : "mainCollapser"}, | 21 | "mainCollapser" : {"@" : "mainCollapser"}, |
22 | "positionCollapser" : {"@" : "positionCollapser"}, | 22 | "positionCollapser" : {"@" : "positionCollapser"}, |
23 | "transformCollapser" : {"@" : "transformCollapser"}, | ||
24 | "styleCollapser" : {"@" : "styleCollapser"}, | 23 | "styleCollapser" : {"@" : "styleCollapser"}, |
25 | "clickerMain" : {"#" : "clicker-main"}, | 24 | "clickerMain" : {"#" : "clicker-main"}, |
26 | "myLabel" : {"#" : "myLabel"}, | 25 | "myLabel" : {"#" : "myLabel"}, |
@@ -182,60 +181,6 @@ | |||
182 | } | 181 | } |
183 | } | 182 | } |
184 | }, | 183 | }, |
185 | "dtext_skew_x" : { | ||
186 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | ||
187 | "properties": { | ||
188 | "element": {"#": "skew-x"}, | ||
189 | "maxValue" : 100, | ||
190 | "minValue" : 0, | ||
191 | "acceptableUnits" : "%", | ||
192 | "units" : "%", | ||
193 | "value" : 0 | ||
194 | }, | ||
195 | "bindings": { | ||
196 | "value": { | ||
197 | "boundObject": {"@": "owner"}, | ||
198 | "boundObjectPropertyPath": "dtextSkewX", | ||
199 | "oneway": false | ||
200 | } | ||
201 | } | ||
202 | }, | ||
203 | "dtext_skew_y" : { | ||
204 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | ||
205 | "properties": { | ||
206 | "element": {"#": "skew-y"}, | ||
207 | "maxValue" : 100, | ||
208 | "minValue" : 0, | ||
209 | "acceptableUnits" : "%", | ||
210 | "units" : "%", | ||
211 | "value" : 0 | ||
212 | }, | ||
213 | "bindings": { | ||
214 | "value": { | ||
215 | "boundObject": {"@": "owner"}, | ||
216 | "boundObjectPropertyPath": "dtextSkewY", | ||
217 | "oneway": false | ||
218 | } | ||
219 | } | ||
220 | }, | ||
221 | "dtext_rotate" : { | ||
222 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | ||
223 | "properties": { | ||
224 | "element": {"#": "rotation"}, | ||
225 | "maxValue" : 360, | ||
226 | "minValue" : -360, | ||
227 | "acceptableUnits" : "degrees", | ||
228 | "units" : "degrees", | ||
229 | "value" : 0 | ||
230 | }, | ||
231 | "bindings": { | ||
232 | "value": { | ||
233 | "boundObject": {"@": "owner"}, | ||
234 | "boundObjectPropertyPath": "dtextRotate", | ||
235 | "oneway": false | ||
236 | } | ||
237 | } | ||
238 | }, | ||
239 | 184 | ||
240 | "mainCollapser" : { | 185 | "mainCollapser" : { |
241 | "prototype" : "js/panels/timeline/Collapser", | 186 | "prototype" : "js/panels/timeline/Collapser", |
@@ -277,26 +222,6 @@ | |||
277 | } | 222 | } |
278 | }, | 223 | }, |
279 | 224 | ||
280 | "transformCollapser" : { | ||
281 | "prototype" : "js/panels/timeline/Collapser", | ||
282 | "properties" : { | ||
283 | "element" : {"#" : "content-transform"}, | ||
284 | "myContent" : {"#":"content-transform"}, | ||
285 | "contentHeight" : 60, | ||
286 | "isLabelClickable" : true, | ||
287 | "clicker" : {"#" : "clicker-transform"}, | ||
288 | "isCollapsed" : true, | ||
289 | "isAnimated" : true | ||
290 | }, | ||
291 | "bindings" : { | ||
292 | "isToggling" : { | ||
293 | "boundObject" : {"@" : "owner" }, | ||
294 | "boundObjectPropertyPath" : "isTransformCollapsed", | ||
295 | "oneway" : false | ||
296 | } | ||
297 | } | ||
298 | }, | ||
299 | |||
300 | "styleCollapser" : { | 225 | "styleCollapser" : { |
301 | "prototype" : "js/panels/timeline/Collapser", | 226 | "prototype" : "js/panels/timeline/Collapser", |
302 | "properties" : { | 227 | "properties" : { |
@@ -333,7 +258,7 @@ | |||
333 | </div> | 258 | </div> |
334 | <div class="collapsible-content content-layer collapsible-collapsed" data-montage-id="content-main"> | 259 | <div class="collapsible-content content-layer collapsible-collapsed" data-montage-id="content-main"> |
335 | <div class="label-position"> | 260 | <div class="label-position"> |
336 | <span class="collapsible-label">Position</span> | 261 | <span class="collapsible-label">Position and Size</span> |
337 | <span class="collapsible-clicker clicker-position collapsible-collapsed" data-montage-id="clicker-position"></span> | 262 | <span class="collapsible-clicker clicker-position collapsible-collapsed" data-montage-id="clicker-position"></span> |
338 | </div> | 263 | </div> |
339 | <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position"> | 264 | <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position"> |
@@ -346,37 +271,16 @@ | |||
346 | <div class="cell-property">Top</div> | 271 | <div class="cell-property">Top</div> |
347 | <div class="cell-value"><div data-montage-id="position-y"></div></div> | 272 | <div class="cell-value"><div data-montage-id="position-y"></div></div> |
348 | </div> | 273 | </div> |
274 | <div class="container-row"> | ||
275 | <div class="cell-property">Width</div> | ||
276 | <div class="cell-value"><div data-montage-id="scale-x"></div></div> | ||
277 | </div> | ||
278 | <div class="container-row"> | ||
279 | <div class="cell-property">Height</div> | ||
280 | <div class="cell-value"><div data-montage-id="scale-y"></div></div> | ||
281 | </div> | ||
349 | </div> | 282 | </div> |
350 | </div> | 283 | </div> |
351 | <div class="label-transform"> | ||
352 | <span class="collapsible-label">Transform</span> | ||
353 | <span class="clicker-transform collapsible-clicker collapsible-collapsed" data-montage-id="clicker-transform"></span> | ||
354 | </div> | ||
355 | <div class="content-transform collapsible-content collapsible-collapsed" data-montage-id="content-transform"> | ||
356 | <div class="layout-tablew"> | ||
357 | <div class="container-row"> | ||
358 | <div class="cell-property">Width</div> | ||
359 | <div class="cell-value"><div data-montage-id="scale-x"></div></div> | ||
360 | </div> | ||
361 | <div class="container-row"> | ||
362 | <div class="cell-property">Height</div> | ||
363 | <div class="cell-value"><div data-montage-id="scale-y"></div></div> | ||
364 | </div> | ||
365 | <div class="container-row"> | ||
366 | <div class="cell-property">Skew X</div> | ||
367 | <div class="cell-value"><div data-montage-id="skew-x"></div></div> | ||
368 | </div> | ||
369 | <div class="container-row"> | ||
370 | <div class="cell-property">Skew Y</div> | ||
371 | <div class="cell-value"><div data-montage-id="skew-y"></div></div> | ||
372 | </div> | ||
373 | <div class="container-row"> | ||
374 | <div class="cell-property">Rotation</div> | ||
375 | <div class="cell-value"><div data-montage-id="rotation"></div></div> | ||
376 | </div> | ||
377 | </div> | ||
378 | |||
379 | </div> | ||
380 | <div class="label-style"> | 284 | <div class="label-style"> |
381 | <span class="collapsible-label">Style</span> | 285 | <span class="collapsible-label">Style</span> |
382 | <span class="clicker-style collapsible-clicker collapsible-collapsed" data-montage-id="clicker-style"></span> | 286 | <span class="clicker-style collapsible-clicker collapsible-collapsed" data-montage-id="clicker-style"></span> |
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 233e811f..c9dd5328 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -147,7 +147,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
147 | } | 147 | } |
148 | }, | 148 | }, |
149 | 149 | ||
150 | /* Position and Transform hottext values */ | 150 | /* Position and Size hottext values */ |
151 | _dtextPositionX : { | 151 | _dtextPositionX : { |
152 | value:null | 152 | value:null |
153 | }, | 153 | }, |
@@ -220,60 +220,6 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
220 | } | 220 | } |
221 | }, | 221 | }, |
222 | 222 | ||
223 | _dtextSkewX : { | ||
224 | value:null | ||
225 | }, | ||
226 | |||
227 | dtextSkewX:{ | ||
228 | serializable: true, | ||
229 | get:function(){ | ||
230 | return this._dtextSkewX; | ||
231 | }, | ||
232 | set:function(value){ | ||
233 | if (this._dtextSkewX !== value) { | ||
234 | this._dtextSkewX = value; | ||
235 | this.layerData.dtextSkewX = value; | ||
236 | } | ||
237 | |||
238 | } | ||
239 | }, | ||