aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js3
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js4
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js4
3 files changed, 6 insertions, 5 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 94d9daec..42f68268 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -276,7 +276,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
276 this.layout_tracks.addEventListener("scroll", this.updateLayerScroll.bind(this), false); 276 this.layout_tracks.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
277 this.user_layers.addEventListener("scroll", this.updateLayerScroll.bind(this), false); 277 this.user_layers.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
278 this.end_hottext.addEventListener("changing", this.updateTrackContainerWidth.bind(this), false); 278 this.end_hottext.addEventListener("changing", this.updateTrackContainerWidth.bind(this), false);
279
280 } 279 }
281 }, 280 },
282 281
@@ -352,7 +351,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
352 351
353 // Clear variables--including repetitions. 352 // Clear variables--including repetitions.
354 this.hashInstance = null; 353 this.hashInstance = null;
355 this.hashLayerNumber = null;
356 this.hashElementMapToLayer = null; 354 this.hashElementMapToLayer = null;
357 this.arrLayers = []; 355 this.arrLayers = [];
358 356
@@ -376,7 +374,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
376 this._bindDocumentEvents(); 374 this._bindDocumentEvents();
377 375
378 this.hashInstance = this.createLayerHashTable(); 376 this.hashInstance = this.createLayerHashTable();
379 //this.hashLayerNumber = this.createLayerNumberHash();
380 this.hashElementMapToLayer = this.createElementMapToLayer(); 377 this.hashElementMapToLayer = this.createElementMapToLayer();
381 this.initTimelineForDocument(); 378 this.initTimelineForDocument();
382 } 379 }
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 00136c4d..17e50789 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -357,7 +357,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
357 }, 357 },
358 set:function(val){ 358 set:function(val){
359 this._trackData = val; 359 this._trackData = val;
360 this.setData(); 360 if(this._trackData){
361 this.setData();
362 }
361 } 363 }
362 }, 364 },
363 365
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index b9ec40ad..77c0dfa8 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -26,7 +26,9 @@ var Tween = exports.Tween = Montage.create(Component, {
26 }, 26 },
27 set:function(val){ 27 set:function(val){
28 this._tweenData = val; 28 this._tweenData = val;
29 this.setData(); 29 if(this._tweenData){
30 this.setData();
31 }
30 } 32 }
31 }, 33 },
32 34