diff options
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index c6b67c9c..90d135af 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -299,11 +299,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
299 | } | 299 | } |
300 | }, | 300 | }, |
301 | 301 | ||
302 | // should be unneeded with one element per layer restriction | ||
302 | _animatedElement:{ | 303 | _animatedElement:{ |
303 | serializable:true, | 304 | serializable:true, |
304 | value:null | 305 | value:null |
305 | }, | 306 | }, |
306 | |||
307 | animatedElement:{ | 307 | animatedElement:{ |
308 | serializable:true, | 308 | serializable:true, |
309 | get:function () { | 309 | get:function () { |
@@ -367,7 +367,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
367 | value:function(){ | 367 | value:function(){ |
368 | this.trackID = this.trackData.layerID; | 368 | this.trackID = this.trackData.layerID; |
369 | this.tweens = this.trackData.tweens; | 369 | this.tweens = this.trackData.tweens; |
370 | this.animatedElement = this.trackData.animatedElement; | 370 | this.animatedElement = this.trackData.animatedElement; // unneeded with one element per layer restriction |
371 | this.arrStyleTracks = this.trackData.arrStyleTracks; | 371 | this.arrStyleTracks = this.trackData.arrStyleTracks; |
372 | this.isTrackAnimated = this.trackData.isTrackAnimated; | 372 | this.isTrackAnimated = this.trackData.isTrackAnimated; |
373 | this.trackDuration = this.trackData.trackDuration; | 373 | this.trackDuration = this.trackData.trackDuration; |
@@ -394,6 +394,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
394 | draw:{ | 394 | draw:{ |
395 | value:function () { | 395 | value:function () { |
396 | this.ninjaStylesContoller = this.application.ninja.stylesController; | 396 | this.ninjaStylesContoller = this.application.ninja.stylesController; |
397 | |||
398 | // animatedElement going away - unneeded below | ||
397 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | 399 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); |
398 | if(this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]){ | 400 | if(this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]){ |
399 | this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]; | 401 | this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]; |
@@ -406,6 +408,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
406 | if(!this.application.ninja.documentController.creatingNewFile){ | 408 | if(!this.application.ninja.documentController.creatingNewFile){ |
407 | if(this.application.ninja.currentDocument.documentRoot.children[0]){ | 409 | if(this.application.ninja.currentDocument.documentRoot.children[0]){ |
408 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | 410 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); |
411 | console.log(this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created); | ||
409 | if(!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created){ | 412 | if(!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created){ |
410 | this.retrieveStoredTweens(); | 413 | this.retrieveStoredTweens(); |
411 | } | 414 | } |