From 730389f72b1f2949e74b4ce8f8625bfd8bc4fa39 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Mon, 18 Jun 2012 16:12:49 -0700 Subject: Timeline: Bug Fixes - Splitting tweens now works again for shift-click interaction - Fixed visual "jump" in keyframes and spans when splitting tweens - Set default easing to "none" to match CSS standard. --- js/panels/Timeline/Tween.reel/Tween.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'js/panels/Timeline/Tween.reel/Tween.js') diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 51a9e215..dcc139a5 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js @@ -110,6 +110,7 @@ var Tween = exports.Tween = Montage.create(Component, { }, set:function (value) { this._tweenID = value; + this.tweenData.tweenID = value; } }, @@ -156,7 +157,7 @@ var Tween = exports.Tween = Montage.create(Component, { }, _easing: { - value: "ease-in" + value: "none" }, easing: { serializable: true, @@ -171,9 +172,11 @@ var Tween = exports.Tween = Montage.create(Component, { draw:{ value:function () { + this.tweenspan.element.style.width = this.spanWidth + "px"; + this.keyframe.element.style.left = (this.spanWidth -5) + "px"; + this.tweenspan.spanWidth = this.spanWidth; this.element.style.left = this.spanPosition + "px"; this.keyframe.position = this.spanWidth; - this.tweenspan.spanWidth = this.spanWidth; this.tweenspan.easing = this.easing; if(this.isTweenAnimated){ this.tweenspan.highlightSpan(); -- cgit v1.2.3