diff options
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index efeeba00..000c81e2 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -218,10 +218,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
218 | 218 | ||
219 | tweenRepetition:{ | 219 | tweenRepetition:{ |
220 | get:function () { | 220 | get:function () { |
221 | return this._spanRepetition; | 221 | return this._tweenRepetition; |
222 | }, | 222 | }, |
223 | set:function (newVal) { | 223 | set:function (newVal) { |
224 | this._spanRepetition = newVal; | 224 | this._tweenRepetition = newVal; |
225 | } | 225 | } |
226 | }, | 226 | }, |
227 | 227 | ||
@@ -371,7 +371,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
371 | this.bypassAnimation = this.trackData.bypassAnimation; | 371 | this.bypassAnimation = this.trackData.bypassAnimation; |
372 | this.trackID = this.trackData.layerID; | 372 | this.trackID = this.trackData.layerID; |
373 | this.tweens = this.trackData.tweens; | 373 | this.tweens = this.trackData.tweens; |
374 | this.animatedElement = this.trackData.animatedElement; // unneeded with one element per layer restriction | 374 | this.animatedElement = this.trackData.animatedElement; |
375 | this.arrStyleTracks = this.trackData.arrStyleTracks; | 375 | this.arrStyleTracks = this.trackData.arrStyleTracks; |
376 | this.isTrackAnimated = this.trackData.isTrackAnimated; | 376 | this.isTrackAnimated = this.trackData.isTrackAnimated; |
377 | this.trackDuration = this.trackData.trackDuration; | 377 | this.trackDuration = this.trackData.trackDuration; |
@@ -431,7 +431,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
431 | this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]; | 431 | this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]; |
432 | } | 432 | } |
433 | } | 433 | } |
434 | |||
435 | } | 434 | } |
436 | }, | 435 | }, |
437 | 436 | ||
@@ -443,7 +442,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
443 | if (selectedIndex !== false) { | 442 | if (selectedIndex !== false) { |
444 | if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) { | 443 | if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) { |
445 | this.retrieveStoredTweens(); | 444 | this.retrieveStoredTweens(); |
446 | |||
447 | } | 445 | } |
448 | } | 446 | } |
449 | } | 447 | } |
@@ -507,6 +505,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
507 | this.updateKeyframeRule(); | 505 | this.updateKeyframeRule(); |
508 | } | 506 | } |
509 | } else { | 507 | } else { |
508 | // TEMP error check | ||
510 | console.log("There must be exactly one element in an animated layer."); | 509 | console.log("There must be exactly one element in an animated layer."); |
511 | } | 510 | } |
512 | } | 511 | } |
@@ -528,7 +527,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
528 | insertTween:{ | 527 | insertTween:{ |
529 | value:function (clickPos) { | 528 | value:function (clickPos) { |
530 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | 529 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); |
531 | this.application.ninja.timeline.selectLayer(selectedIndex, true); | 530 | this.application.ninja.timeline.selectLayer(selectedIndex, true); |
532 | 531 | ||
533 | var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80); | 532 | var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80); |
534 | var currentMillisec = currentMillisecPerPixel * clickPos; | 533 | var currentMillisec = currentMillisecPerPixel * clickPos; |