diff options
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index ddeb1449..891feada 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -771,6 +771,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
771 | // delete the current rule | 771 | // delete the current rule |
772 | this.ninjaStylesContoller.deleteRule(this.currentKeyframeRule); | 772 | this.ninjaStylesContoller.deleteRule(this.currentKeyframeRule); |
773 | 773 | ||
774 | // first combine all style track tween arrays with the main track tween array | ||
775 | |||
774 | // build the new keyframe string | 776 | // build the new keyframe string |
775 | var keyframeString = "@-webkit-keyframes " + this.animationName + " {"; | 777 | var keyframeString = "@-webkit-keyframes " + this.animationName + " {"; |
776 | 778 | ||
@@ -796,9 +798,14 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
796 | // Init and event handler for layer expand/collapse | 798 | // Init and event handler for layer expand/collapse |
797 | init:{ | 799 | init:{ |
798 | value:function () { | 800 | value:function () { |
799 | 801 | ||
800 | this.arrPositionTracks = [0, 1]; | 802 | // create track objects for position and transform tracks and push into arrays instead of dummy arrays |
801 | this.arrTransformTracks = [0, 1, 2, 3, 4]; | 803 | |
804 | //this.createPositionTracks(); | ||
805 | this.arrPositionTracks = [0, 1, 2, 3]; | ||
806 | |||
807 | // get rid of transform tracks | ||
808 | //this.arrTransformTracks = [0, 1, 2, 3, 4]; | ||
802 | 809 | ||
803 | // Register event handler for layer events. | 810 | // Register event handler for layer events. |
804 | defaultEventManager.addEventListener("layerEvent", this, false); | 811 | defaultEventManager.addEventListener("layerEvent", this, false); |
@@ -806,6 +813,12 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
806 | } | 813 | } |
807 | }, | 814 | }, |
808 | 815 | ||
816 | createPositionTracks:{ | ||
817 | value:function(){ | ||
818 | // create track objects for position and transform tracks and push into arrays | ||
819 | } | ||
820 | }, | ||
821 | |||
809 | handleLayerEvent:{ | 822 | handleLayerEvent:{ |
810 | value:function (layerEvent) { | 823 | value:function (layerEvent) { |
811 | if (layerEvent.layerID !== this.trackID) { | 824 | if (layerEvent.layerID !== this.trackID) { |