aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJon Reid2012-06-18 16:24:02 -0700
committerJon Reid2012-06-18 16:24:02 -0700
commit3163108217677d7eec1c79cf6aa7525cdd6600ef (patch)
tree5f584a223d3f77934a1edd2abcfe4530e06ef859 /js
parent730389f72b1f2949e74b4ce8f8625bfd8bc4fa39 (diff)
downloadninja-3163108217677d7eec1c79cf6aa7525cdd6600ef.tar.gz
Timeline: Default easing for new animation keyframes set to "none" per CSS
standard.
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/Span.reel/Span.js4
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js2
2 files changed, 3 insertions, 3 deletions
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, {
59 }, 59 },
60 60
61 _easing: { 61 _easing: {
62 value: "ease-in" 62 value: "none"
63 }, 63 },
64 easing: { 64 easing: {
65 get: function() { 65 get: function() {
@@ -68,7 +68,7 @@ var Span = exports.Span = Montage.create(Component, {
68 set: function(newVal) { 68 set: function(newVal) {
69 if (newVal !== this._easing) { 69 if (newVal !== this._easing) {
70 if (typeof(newVal) === "undefined") { 70 if (typeof(newVal) === "undefined") {
71 newVal = "ease-in"; 71 newVal = "none";
72 } 72 }
73 this._easing = newVal; 73 this._easing = newVal;
74 this.parentComponent.setKeyframeEase(newVal); 74 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, {
770 newTween.tweenData.keyFrameMillisec = currentMillisec; 770 newTween.tweenData.keyFrameMillisec = currentMillisec;
771 newTween.tweenData.tweenID = this.nextKeyframe; 771 newTween.tweenData.tweenID = this.nextKeyframe;
772 newTween.tweenData.spanPosition = clickPos - newTween.tweenData.spanWidth; 772 newTween.tweenData.spanPosition = clickPos - newTween.tweenData.spanWidth;
773 newTween.tweenData.easing = "ease-in"; 773 newTween.tweenData.easing = "none";
774 newTween.tweenData.tweenedProperties = []; 774 newTween.tweenData.tweenedProperties = [];
775 newTween.tweenData.tweenedProperties["top"] = this.animatedElement.offsetTop + "px"; 775 newTween.tweenData.tweenedProperties["top"] = this.animatedElement.offsetTop + "px";
776 newTween.tweenData.tweenedProperties["left"] = this.animatedElement.offsetLeft + "px"; 776 newTween.tweenData.tweenedProperties["left"] = this.animatedElement.offsetLeft + "px";