aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 8f867d35..1edc04ba 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -229,6 +229,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
229 }, 229 },
230 set:function (val) { 230 set:function (val) {
231 this._trackDuration = val; 231 this._trackDuration = val;
232 if(this._trackDuration > this.application.ninja.timeline.masterDuration){
233 this.application.ninja.timeline.masterDuration = this._trackDuration;
234 }
232 } 235 }
233 }, 236 },
234 237
@@ -413,9 +416,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
413 // need to check timeline master duration if greater than this track duration 416 // need to check timeline master duration if greater than this track duration
414 this.trackDuration = currentMillisec; 417 this.trackDuration = currentMillisec;
415 418
416 if(this.trackDuration > this.application.ninja.timeline.masterDuration){ 419
417 this.application.ninja.timeline.masterDuration = this.trackDuration;
418 }
419 420
420 var newTween = {}; 421 var newTween = {};
421 422