aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js37
1 files changed, 18 insertions, 19 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index b9a4574c..2096b3ce 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -302,11 +302,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
302 } 302 }
303 }, 303 },
304 304
305 // should be unneeded with one element per layer restriction
305 _animatedElement:{ 306 _animatedElement:{
306 serializable:true, 307 serializable:true,
307 value:null 308 value:null
308 }, 309 },
309
310 animatedElement:{ 310 animatedElement:{
311 serializable:true, 311 serializable:true,
312 get:function () { 312 get:function () {
@@ -373,24 +373,21 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
373 373
374 setData:{ 374 setData:{
375 value:function(){ 375 value:function(){
376 if (this.trackData) { 376 this.bypassAnimation = this.trackData.bypassAnimation;
377 this.bypassAnimation = this.trackData.bypassAnimation; 377 this.trackID = this.trackData.layerID;
378 this.trackID = this.trackData.layerID; 378 this.tweens = this.trackData.tweens;
379 this.tweens = this.trackData.tweens; 379 this.animatedElement = this.trackData.animatedElement; // unneeded with one element per layer restriction
380 this.animatedElement = this.trackData.animatedElement; 380 this.arrStyleTracks = this.trackData.arrStyleTracks;
381 this.arrStyleTracks = this.trackData.arrStyleTracks; 381 this.isTrackAnimated = this.trackData.isTrackAnimated;
382 this.isTrackAnimated = this.trackData.isTrackAnimated; 382 this.trackDuration = this.trackData.trackDuration;
383 this.trackDuration = this.trackData.trackDuration; 383 this.animationName = this.trackData.animationName;
384 this.animationName = this.trackData.animationName; 384 this.currentKeyframeRule = this.trackData.currentKeyframeRule;
385 this.currentKeyframeRule = this.trackData.currentKeyframeRule; 385 this.isMainCollapsed = this.trackData.isMainCollapsed;
386 this.isMainCollapsed = this.trackData.isMainCollapsed; 386 this.isPositionCollapsed = this.trackData.isPositionCollapsed;
387 this.isPositionCollapsed = this.trackData.isPositionCollapsed; 387 this.isTransformCollapsed = this.trackData.isTransformCollapsed;
388 this.isTransformCollapsed = this.trackData.isTransformCollapsed; 388 this.isStyleCollapsed = this.trackData.isStyleCollapsed;
389 this.isStyleCollapsed = this.trackData.isStyleCollapsed; 389 this.trackPosition = this.trackData.trackPosition;
390 this.trackPosition = this.trackData.trackPosition; 390 this.needsDraw = true;
391 this.needsDraw = true;
392 }
393
394 } 391 }
395 }, 392 },
396 393
@@ -433,6 +430,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
433 draw:{ 430 draw:{
434 value:function () { 431 value:function () {
435 this.ninjaStylesContoller = this.application.ninja.stylesController; 432 this.ninjaStylesContoller = this.application.ninja.stylesController;
433
434 // animatedElement going away - unneeded below
436 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); 435 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
437 if(this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]){ 436 if(this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]){
438 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]; 437 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0];