diff options
author | Jonathan Duran | 2012-03-01 23:58:41 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-03-01 23:58:41 -0800 |
commit | ef41a2897809d768e066ee3b4bfbb436ab20175c (patch) | |
tree | e46ba526f806a620b65e5053f2f57203c17bc360 /js/panels/Timeline/TimelineTrack.reel | |
parent | 8b08cbf68180187fe3913ea853adc0f65895fde5 (diff) | |
download | ninja-ef41a2897809d768e066ee3b4bfbb436ab20175c.tar.gz |
Timeline bug fixes and cleanup
Deselect tweens on every selection change. Replace JS alerts with console logs. Cleanup obsolete models and references.
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index a10cb4d8..d35f59d3 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -404,7 +404,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
404 | this.handleNewTween(ev); | 404 | this.handleNewTween(ev); |
405 | } | 405 | } |
406 | } else { | 406 | } else { |
407 | alert("There must be exactly one element in an animated layer.") | 407 | console.log("There must be exactly one element in an animated layer."); |
408 | } | 408 | } |
409 | } | 409 | } |
410 | } | 410 | } |
@@ -463,14 +463,13 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
463 | 463 | ||
464 | splitTween:{ | 464 | splitTween:{ |
465 | value:function (ev) { | 465 | value:function (ev) { |
466 | alert("Splitting an existing span with a new keyframe is not yet supported."); | 466 | console.log("Splitting an existing span with a new keyframe is not yet supported."); |
467 | //this.log("splitting tween at span offsetX: " + ev.offsetX); | ||
468 | } | 467 | } |
469 | }, | 468 | }, |
470 | 469 | ||
471 | retrieveStoredTweens:{ | 470 | retrieveStoredTweens:{ |
472 | value:function () { | 471 | value:function () { |
473 | var percentValue, fraction, splitValue,offsetAttribute,topOffSetAttribute,leftOffsetAttribute | 472 | var percentValue, fraction, splitValue,offsetAttribute,topOffSetAttribute,leftOffsetAttribute; |
474 | var currentMilliSec,currentMilliSecPerPixel,clickPosition,tempTiming,tempTimingInt,trackTiming,i = 0; | 473 | var currentMilliSec,currentMilliSecPerPixel,clickPosition,tempTiming,tempTimingInt,trackTiming,i = 0; |
475 | 474 | ||
476 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | 475 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); |
@@ -504,7 +503,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
504 | newTween.tweenedProperties["top"] = tempTopOffset; | 503 | newTween.tweenedProperties["top"] = tempTopOffset; |
505 | newTween.tweenedProperties["left"] = tempLeftOffset; | 504 | newTween.tweenedProperties["left"] = tempLeftOffset; |
506 | this.tweens.push(newTween); | 505 | this.tweens.push(newTween); |
507 | |||
508 | } | 506 | } |
509 | else { | 507 | else { |
510 | tempTiming = trackTiming.split("s"); | 508 | tempTiming = trackTiming.split("s"); |
@@ -525,8 +523,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
525 | newTween.tweenedProperties["top"] = tempTopOffset; | 523 | newTween.tweenedProperties["top"] = tempTopOffset; |
526 | newTween.tweenedProperties["left"] = tempLeftOffset; | 524 | newTween.tweenedProperties["left"] = tempLeftOffset; |
527 | this.tweens.push(newTween); | 525 | this.tweens.push(newTween); |
528 | |||
529 | |||
530 | } | 526 | } |
531 | this.nextKeyframe += 1; | 527 | this.nextKeyframe += 1; |
532 | } | 528 | } |