diff options
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index adad6ff3..6d557845 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -473,6 +473,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
473 | this.isStyleCollapsed = this.trackData.isStyleCollapsed; | 473 | this.isStyleCollapsed = this.trackData.isStyleCollapsed; |
474 | this.trackPosition = this.trackData.trackPosition; | 474 | this.trackPosition = this.trackData.trackPosition; |
475 | this.isVisible = this.trackData.isVisible; | 475 | this.isVisible = this.trackData.isVisible; |
476 | this.trackEditorProperty = "master"; | ||
476 | this.needsDraw = true; | 477 | this.needsDraw = true; |
477 | } | 478 | } |
478 | }, | 479 | }, |
@@ -942,15 +943,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
942 | value:function(){ | 943 | value:function(){ |
943 | // create track objects for position and transform tracks and push into arrays | 944 | // create track objects for position and transform tracks and push into arrays |
944 | 945 | ||
945 | // create 'top' track | ||
946 | var newTopTrack = {}; | ||
947 | newTopTrack.propTrackData = {}; | ||
948 | newTopTrack.propTrackData.propTweens = []; | ||
949 | newTopTrack.propTrackData.styleIndex = 0; | ||
950 | newTopTrack.propTrackData.trackType = "position"; | ||
951 | newTopTrack.propTrackData.trackEditorProperty = "top"; | ||
952 | this.arrPositionTracks.push(newTopTrack); | ||
953 | |||
954 | // create 'left' track | 946 | // create 'left' track |
955 | var newLeftTrack = {}; | 947 | var newLeftTrack = {}; |
956 | newLeftTrack.propTrackData = {}; | 948 | newLeftTrack.propTrackData = {}; |
@@ -960,6 +952,15 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
960 | newLeftTrack.propTrackData.trackEditorProperty = "left"; | 952 | newLeftTrack.propTrackData.trackEditorProperty = "left"; |
961 | this.arrPositionTracks.push(newLeftTrack); | 953 | this.arrPositionTracks.push(newLeftTrack); |
962 | 954 | ||
955 | // create 'top' track | ||
956 | var newTopTrack = {}; | ||
957 | newTopTrack.propTrackData = {}; | ||
958 | newTopTrack.propTrackData.propTweens = []; | ||
959 | newTopTrack.propTrackData.styleIndex = 0; | ||
960 | newTopTrack.propTrackData.trackType = "position"; | ||
961 | newTopTrack.propTrackData.trackEditorProperty = "top"; | ||
962 | this.arrPositionTracks.push(newTopTrack); | ||
963 | |||
963 | // create 'width' track | 964 | // create 'width' track |
964 | var newWidthTrack = {}; | 965 | var newWidthTrack = {}; |
965 | newWidthTrack.propTrackData = {}; | 966 | newWidthTrack.propTrackData = {}; |