Merge branch 'refs/heads/Timeline-local' into Timeline

1 files changed, 4 insertions, 2 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 0c5121cd..30280727 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -556,7 +556,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 +652,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
+});