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.html9
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js37
2 files changed, 43 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 3f3bf24a..b666f921 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -98,7 +98,14 @@
98 "prototype" : "js/panels/Timeline/PropertyTrack.reel", 98 "prototype" : "js/panels/Timeline/PropertyTrack.reel",
99 "properties" : { 99 "properties" : {
100 "element":{"#": "position-track-base"} 100 "element":{"#": "position-track-base"}
101 } 101 },
102 "bindings" : {
103 "propTrackData" : {
104 "boundObject" : {"@" : "positionTracksRepetition"},
105 "boundObjectPropertyPath" : "objectAtCurrentIteration.propTrackData",
106 "oneway" : false
107 }
108 }
102 }, 109 },
103 110
104 "mainCollapser" : { 111 "mainCollapser" : {
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 891feada..2ce1a637 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -801,8 +801,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
801 801
802 // create track objects for position and transform tracks and push into arrays instead of dummy arrays 802 // create track objects for position and transform tracks and push into arrays instead of dummy arrays
803 803
804 //this.createPositionTracks(); 804 this.createPositionTracks();
805 this.arrPositionTracks = [0, 1, 2, 3]; 805 //this.arrPositionTracks = [0, 1, 2, 3];
806 806
807 // get rid of transform tracks 807 // get rid of transform tracks
808 //this.arrTransformTracks = [0, 1, 2, 3, 4]; 808 //this.arrTransformTracks = [0, 1, 2, 3, 4];
@@ -816,6 +816,38 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
816 createPositionTracks:{ 816 createPositionTracks:{
817 value:function(){ 817 value:function(){
818 // create track objects for position and transform tracks and push into arrays 818 // create track objects for position and transform tracks and push into arrays
819
820 // create 'top' track
821 var newTopTrack = {};
822 newTopTrack.propTrackData = {};
823 newTopTrack.propTrackData.propTweens = [];
824 newTopTrack.propTrackData.styleIndex = 0;
825 newTopTrack.propTrackData.trackType = "position";
826 this.arrPositionTracks.push(newTopTrack);
827
828 // create 'left' track
829 var newLeftTrack = {};
830 newLeftTrack.propTrackData = {};
831 newLeftTrack.propTrackData.propTweens = [];
832 newLeftTrack.propTrackData.styleIndex = 1;
833 newLeftTrack.propTrackData.trackType = "position";
834 this.arrPositionTracks.push(newLeftTrack);
835
836 // create 'width' track
837 var newWidthTrack = {};
838 newWidthTrack.propTrackData = {};
839 newWidthTrack.propTrackData.propTweens = [];
840 newWidthTrack.propTrackData.styleIndex = 2;
841 newWidthTrack.propTrackData.trackType = "position";
842 this.arrPositionTracks.push(newWidthTrack);
843
844 // create 'height' track
845 var newHeightTrack = {};
846 newHeightTrack.propTrackData = {};
847 newHeightTrack.propTrackData.propTweens = [];
848 newHeightTrack.propTrackData.styleIndex = 3;
849 newHeightTrack.propTrackData.trackType = "position";
850 this.arrPositionTracks.push(newHeightTrack);
819 } 851 }
820 }, 852 },
821 853
@@ -831,6 +863,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
831 newStyleTrack.propTrackData = {}; 863 newStyleTrack.propTrackData = {};
832 newStyleTrack.propTrackData.styleSelection = layerEvent.styleSelection; 864 newStyleTrack.propTrackData.styleSelection = layerEvent.styleSelection;
833 newStyleTrack.propTrackData.propTweens = []; 865 newStyleTrack.propTrackData.propTweens = [];
866 newStyleTrack.propTrackData.trackType = "style";
834 newStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex; 867 newStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex;
835 868
836 console.log(layerEvent.styleIndex); 869 console.log(layerEvent.styleIndex);