aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJon Reid2012-06-15 14:10:36 -0700
committerJon Reid2012-06-15 14:10:36 -0700
commit0639b36bd4dc9c4c7659b87c05a22a08a4c49221 (patch)
treeb7332b3ae3fcb065df1ed36cd02fded78468af3e /js/panels/Timeline
parent0b41d5c873b25461e2217782af1c410b89cb56de (diff)
downloadninja-0639b36bd4dc9c4c7659b87c05a22a08a4c49221.tar.gz
Timeline: Bug fix: When adding a new keyframe, easing is set to "undefined".
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js1
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js2
2 files changed, 2 insertions, 1 deletions
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, {
747 newTween.tweenData.keyFrameMillisec = currentMillisec; 747 newTween.tweenData.keyFrameMillisec = currentMillisec;
748 newTween.tweenData.tweenID = this.nextKeyframe; 748 newTween.tweenData.tweenID = this.nextKeyframe;
749 newTween.tweenData.spanPosition = clickPos - newTween.tweenData.spanWidth; 749 newTween.tweenData.spanPosition = clickPos - newTween.tweenData.spanWidth;
750 newTween.tweenData.easing = "ease-in";
750 newTween.tweenData.tweenedProperties = []; 751 newTween.tweenData.tweenedProperties = [];
751 newTween.tweenData.tweenedProperties["top"] = this.animatedElement.offsetTop + "px"; 752 newTween.tweenData.tweenedProperties["top"] = this.animatedElement.offsetTop + "px";
752 newTween.tweenData.tweenedProperties["left"] = this.animatedElement.offsetLeft + "px"; 753 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, {
156 }, 156 },
157 157
158 _easing: { 158 _easing: {
159 value: false 159 value: "ease-in"
160 }, 160 },
161 easing: { 161 easing: {
162 serializable: true, 162 serializable: true,