aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html2
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js12
2 files changed, 12 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index de2969bb..ed013505 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -72,7 +72,7 @@
72 "element":{"#": "style-track-base"} 72 "element":{"#": "style-track-base"}
73 }, 73 },
74 "bindings" : { 74 "bindings" : {
75 "trackData" : { 75 "propTrackData" : {
76 "boundObject" : {"@" : "styleTrackRepetition"}, 76 "boundObject" : {"@" : "styleTrackRepetition"},
77 "boundObjectPropertyPath" : "objectAtCurrentIteration.propTrackData", 77 "boundObjectPropertyPath" : "objectAtCurrentIteration.propTrackData",
78 "oneway" : false 78 "oneway" : false
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 000c81e2..8bb00990 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -710,7 +710,17 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
710 } 710 }
711 if (layerEvent.layerEventType === "newStyle") { 711 if (layerEvent.layerEventType === "newStyle") {
712 // TODO: Add a real track of tweens. Probably need a method for that. 712 // TODO: Add a real track of tweens. Probably need a method for that.
713 this.arrStyleTracks.push("1"); 713
714 var newStyleTrack = {};
715 newStyleTrack.propTrackData = {};
716 newStyleTrack.propTrackData.styleSelection = layerEvent.styleSelection;
717 newStyleTrack.propTrackData.propTweens = [];
718 newStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex;
719 console.log(layerEvent.styleSelection);
720 console.log(layerEvent.styleIndex);
721
722 this.arrStyleTracks.push(newStyleTrack);
723
714 } else if (layerEvent.layerEventType === "deleteStyle") { 724 } else if (layerEvent.layerEventType === "deleteStyle") {
715 // TODO: Delete the right track. Index can be passed in event object, use that for splice(). 725 // TODO: Delete the right track. Index can be passed in event object, use that for splice().
716 this.arrStyleTracks.pop(); 726 this.arrStyleTracks.pop();