From 0639b36bd4dc9c4c7659b87c05a22a08a4c49221 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Fri, 15 Jun 2012 14:10:36 -0700 Subject: Timeline: Bug fix: When adding a new keyframe, easing is set to "undefined". --- js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 1 + js/panels/Timeline/Tween.reel/Tween.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 695f13ac..9276a7df 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js @@ -747,6 +747,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { newTween.tweenData.keyFrameMillisec = currentMillisec; newTween.tweenData.tweenID = this.nextKeyframe; newTween.tweenData.spanPosition = clickPos - newTween.tweenData.spanWidth; + newTween.tweenData.easing = "ease-in"; newTween.tweenData.tweenedProperties = []; newTween.tweenData.tweenedProperties["top"] = this.animatedElement.offsetTop + "px"; newTween.tweenData.tweenedProperties["left"] = this.animatedElement.offsetLeft + "px"; diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index d96cc932..51a9e215 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js @@ -156,7 +156,7 @@ var Tween = exports.Tween = Montage.create(Component, { }, _easing: { - value: false + value: "ease-in" }, easing: { serializable: true, -- cgit v1.2.3