aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Span.reel/Span.js
diff options
context:
space:
mode:
authorJonathan Duran2012-06-18 08:43:21 -0700
committerJonathan Duran2012-06-18 08:43:21 -0700
commitb51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (patch)
tree5802f2d8581ee13c1172f0992ace2a66069f287c /js/panels/Timeline/Span.reel/Span.js
parentf8f7754ff19a8d2bc7f66fbaa3feb13082076dc5 (diff)
parent1f8cb3a25745e5eb07bffccb4f5d5958e595e740 (diff)
downloadninja-b51c9448bc187f9bfa3ab39c366657ec2bb9e2fb.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/Span.reel/Span.js')
-rw-r--r--js/panels/Timeline/Span.reel/Span.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js
index 5b0f3f94..59cd13ed 100644
--- a/js/panels/Timeline/Span.reel/Span.js
+++ b/js/panels/Timeline/Span.reel/Span.js
@@ -67,6 +67,9 @@ var Span = exports.Span = Montage.create(Component, {
67 }, 67 },
68 set: function(newVal) { 68 set: function(newVal) {
69 if (newVal !== this._easing) { 69 if (newVal !== this._easing) {
70 if (typeof(newVal) === "undefined") {
71 newVal = "ease-in";
72 }
70 this._easing = newVal; 73 this._easing = newVal;
71 this.parentComponent.setKeyframeEase(newVal); 74 this.parentComponent.setKeyframeEase(newVal);
72 this.needsDraw = true; 75 this.needsDraw = true;