aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJon Reid2012-06-21 11:32:20 -0700
committerJon Reid2012-06-21 11:32:20 -0700
commitaabd9b98341308cd0d276e6e788b7a3f9531c394 (patch)
tree36a2f82d11a40ac2cda77f7f0d64dccfba4e7353 /js/panels
parent782b66c783df4a9c36fa240cc77900e69b9130cf (diff)
downloadninja-aabd9b98341308cd0d276e6e788b7a3f9531c394.tar.gz
Timeline: Bug Fix: Document switching was doubling position tracks.
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js1
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js5
2 files changed, 5 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 89389469..b8ba5feb 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -595,7 +595,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
595 prepareForDraw:{ 595 prepareForDraw:{
596 value:function () { 596 value:function () {
597 this.initTimeline(); 597 this.initTimeline();
598
599 } 598 }
600 }, 599 },
601 600
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index bf380e00..3cf754b8 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -1051,6 +1051,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
1051 createPositionTracks:{ 1051 createPositionTracks:{
1052 value:function(){ 1052 value:function(){
1053 // create track objects for position and transform tracks and push into arrays 1053 // create track objects for position and transform tracks and push into arrays
1054
1055 // ... but only do it if we haven't already.
1056 if (this.arrPositionTracks.length > 0) {
1057 return;
1058 }
1054 1059
1055 // create 'left' track 1060 // create 'left' track
1056 var newLeftTrack = {}; 1061 var newLeftTrack = {};