aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJonathan Duran2012-02-25 16:29:33 -0800
committerJonathan Duran2012-02-25 16:29:33 -0800
commit7965d1e56ee6e02d049f4e1a8eb5dad291967015 (patch)
tree2db276ca11c415eb2122cdfe1afa5a0db0d10f47 /js
parent47b025b90af2a5d43dddf3b41f8c96fd26c3e4f1 (diff)
downloadninja-7965d1e56ee6e02d049f4e1a8eb5dad291967015.tar.gz
Timeline: Order of tweens and corresponding layers taken care over
Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index d837997a..a36e666b 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -464,7 +464,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
464 value:function () { 464 value:function () {
465 var percentValue, fraction, splitValue,offsetAttribute,topOffSetAttribute,leftOffsetAttribute, i = 0; 465 var percentValue, fraction, splitValue,offsetAttribute,topOffSetAttribute,leftOffsetAttribute, i = 0;
466 466
467 this.animatedElement = this.application.ninja.timeline.arrLayers[this.trackID - 1].elementsList[0]; 467 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
468 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].elementsList[0];
468 this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name"); 469 this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name");
469 this.animationDuration = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); 470 this.animationDuration = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration");
470 if(this.animationDuration){ 471 if(this.animationDuration){