From 3163108217677d7eec1c79cf6aa7525cdd6600ef Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Mon, 18 Jun 2012 16:24:02 -0700
Subject: Timeline: Default easing for new animation keyframes set to "none"
 per CSS standard.

---
 js/panels/Timeline/Span.reel/Span.js                   | 4 ++--
 js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/panels/Timeline')

diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js
index 59cd13ed..91ce1cfb 100644
--- a/js/panels/Timeline/Span.reel/Span.js
+++ b/js/panels/Timeline/Span.reel/Span.js
@@ -59,7 +59,7 @@ var Span = exports.Span = Montage.create(Component, {
     },
     
     _easing: {
-    	value: "ease-in"
+    	value: "none"
     },
     easing: {
     	get: function() {
@@ -68,7 +68,7 @@ var Span = exports.Span = Montage.create(Component, {
     	set: function(newVal) {
     		if (newVal !== this._easing) {
     			if (typeof(newVal) === "undefined") {
-    				newVal = "ease-in";
+    				newVal = "none";
     			}
     			this._easing = newVal;
     			this.parentComponent.setKeyframeEase(newVal);
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 74dd1ca1..a4d20c39 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -770,7 +770,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.easing = "none";
                 newTween.tweenData.tweenedProperties = [];
                 newTween.tweenData.tweenedProperties["top"] = this.animatedElement.offsetTop + "px";
                 newTween.tweenData.tweenedProperties["left"] = this.animatedElement.offsetLeft + "px";
-- 
cgit v1.2.3