1 files changed, 20 insertions, 4 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 0c5121cd..a36e666b 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -462,9 +462,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 
     retrieveStoredTweens:{
         value:function () {
-            var percentValue, fraction, splitValue, i = 0;
+            var percentValue, fraction, splitValue,offsetAttribute,topOffSetAttribute,leftOffsetAttribute, i = 0;
 
-            this.animatedElement = this.application.ninja.timeline.arrLayers[this.trackID - 1].elementsList[0];
+            var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
+            this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].elementsList[0];
             this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name");
             this.animationDuration = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration");
             if(this.animationDuration){
@@ -478,12 +479,22 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 while (this.currentKeyframeRule[i]) {
                     var newTween = {};
 
+                    offsetAttribute = this.currentKeyframeRule[i].cssText.split(" ");
+                    topOffSetAttribute = offsetAttribute[3].split("px");
+                    leftOffsetAttribute = offsetAttribute[5].split("px");
+
+                    parseInt(topOffSetAttribute[0]);
+                    parseInt(leftOffsetAttribute[0]);
+
                     if (this.currentKeyframeRule[i].keyText === "0%") {
                         newTween.spanWidth = 0;
                         newTween.keyFramePosition = 0;
                         newTween.keyFrameMillisec = 0;
                         newTween.tweenID = 0;
                         newTween.spanPosition = 0;
+                        newTween.tweenedProperties = [];
+                        newTween.tweenedProperties["top"] = topOffSetAttribute[0];
+                        newTween.tweenedProperties["left"] = leftOffsetAttribute[0];
                         this.tweens.push(newTween);
 
                     }
@@ -499,6 +510,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                         newTween.keyFrameMillisec = this.currentMilliSec;
                         newTween.tweenID = this.nextKeyframe;
                         newTween.spanPosition = this.clickPos - newTween.spanWidth;
+                        newTween.tweenedProperties=[];
+                        newTween.tweenedProperties["top"] = topOffSetAttribute[0];
+                        newTween.tweenedProperties["left"] = leftOffsetAttribute[0];
                         this.tweens.push(newTween);
 
 
@@ -556,7 +570,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:function () {
             var that = this;
             
-            this.arrPositionTracks = [0, 1, 2];
+            this.arrPositionTracks = [0, 1];
             this.arrTransformTracks = [0, 1, 2, 3, 4];
             
             this.label = this.element.querySelector(".label-main");
@@ -652,7 +666,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                         this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation;
                         this._styleCollapser.handleCollapserLabelClick();
                 }
+            } else if (layerEvent.layerEventType === "deleteStyle") {
+                this.arrStyleTracks.pop();
             }
         }
     }
-});
\ No newline at end of file
+});