aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html35
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js18
2 files changed, 53 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 0c302436..9d0b8210 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -115,6 +115,41 @@
115 "boundObject" : {"@" : "repetition1"}, 115 "boundObject" : {"@" : "repetition1"},
116 "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", 116 "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
117 "oneway" : false 117 "oneway" : false
118 },
119 "dtextPositionX" : {
120 "boundObject" : {"@" : "repetition1"},
121 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX",
122 "oneway" : false
123 },
124 "dtextPositionY" : {
125 "boundObject" : {"@" : "repetition1"},
126 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionY",
127 "oneway" : false
128 },
129 "dtextSkewX" : {
130 "boundObject" : {"@" : "repetition1"},
131 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewX",
132 "oneway" : false
133 },
134 "dtextSkewY" : {
135 "boundObject" : {"@" : "repetition1"},
136 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewY",
137 "oneway" : false
138 },
139 "dtextScaleX" : {
140 "boundObject" : {"@" : "repetition1"},
141 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleX",
142 "oneway" : false
143 },
144 "dtextScaleY" : {
145 "boundObject" : {"@" : "repetition1"},
146 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleY",
147 "oneway" : false
148 },
149 "dtextRotate" : {
150 "boundObject" : {"@" : "repetition1"},
151 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextRotate",
152 "oneway" : false
118 } 153 }
119 } 154 }
120 }, 155 },
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 5f484cdb..2143dafd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -242,6 +242,24 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
242 _firstLayerDraw = true; 242 _firstLayerDraw = true;
243 } 243 }
244 }, 244 },
245
246 clearTimelinePanel : {
247 value: function() {
248 console.log('clearing timeline...')
249 this.arrTracks = null;
250 this.arrLayers = null;
251 this.currentLayerNumber = 0;
252 this.currentLayerSelected = null;
253 this.currentTrackSelected = null;
254 this.selectedKeyframes = [];
255 this.selectedTweens = [];
256 this._captureSelection = false;
257 this._openDoc = false;
258 this.end_hottext.value = 25;
259 this.updateTrackContainerWidth();
260 this.needsDraw = true;
261 }
262 },
245 263
246 updateTrackContainerWidth:{ 264 updateTrackContainerWidth:{
247 value: function(){ 265 value: function(){