aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-02-25 16:20:16 -0800
committerJonathan Duran2012-02-25 16:20:16 -0800
commit4e15de39bc1ea1a4c1141373d08b858b20106987 (patch)
treeef3030d561a0bef731f84078d5ece503cd60f37e /js/panels/Timeline/TimelineTrack.reel
parent1bc2de516c86f67c2107bd50df0589a273f4c5ab (diff)
parentf14bc1ace048e46cbcb7148dbe37a5d2065a3779 (diff)
downloadninja-4e15de39bc1ea1a4c1141373d08b858b20106987.tar.gz
Merge branch 'refs/heads/Timeline-local' into Timeline
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js6
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, {
556 value:function () { 556 value:function () {
557 var that = this; 557 var that = this;
558 558
559 this.arrPositionTracks = [0, 1, 2]; 559 this.arrPositionTracks = [0, 1];
560 this.arrTransformTracks = [0, 1, 2, 3, 4]; 560 this.arrTransformTracks = [0, 1, 2, 3, 4];
561 561
562 this.label = this.element.querySelector(".label-main"); 562 this.label = this.element.querySelector(".label-main");
@@ -652,7 +652,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
652 this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation; 652 this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation;
653 this._styleCollapser.handleCollapserLabelClick(); 653 this._styleCollapser.handleCollapserLabelClick();
654 } 654 }
655 } else if (layerEvent.layerEventType === "deleteStyle") {
656 this.arrStyleTracks.pop();
655 } 657 }
656 } 658 }
657 } 659 }
658}); \ No newline at end of file 660});