diff options
author | Jon Reid | 2012-06-18 16:12:49 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-18 16:12:49 -0700 |
commit | 730389f72b1f2949e74b4ce8f8625bfd8bc4fa39 (patch) | |
tree | 5613be2e03a88cf76d80602b4210801a107fa895 /js/panels/Timeline/Tween.reel/Tween.js | |
parent | b51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff) | |
download | ninja-730389f72b1f2949e74b4ce8f8625bfd8bc4fa39.tar.gz |
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.
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 7 |
1 files changed, 5 insertions, 2 deletions
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, { | |||
110 | }, | 110 | }, |
111 | set:function (value) { | 111 | set:function (value) { |
112 | this._tweenID = value; | 112 | this._tweenID = value; |
113 | this.tweenData.tweenID = value; | ||
113 | } | 114 | } |
114 | }, | 115 | }, |
115 | 116 | ||
@@ -156,7 +157,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
156 | }, | 157 | }, |
157 | 158 | ||
158 | _easing: { | 159 | _easing: { |
159 | value: "ease-in" | 160 | value: "none" |
160 | }, | 161 | }, |
161 | easing: { | 162 | easing: { |
162 | serializable: true, | 163 | serializable: true, |
@@ -171,9 +172,11 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
171 | 172 | ||
172 | draw:{ | 173 | draw:{ |
173 | value:function () { | 174 | value:function () { |
175 | this.tweenspan.element.style.width = this.spanWidth + "px"; | ||
176 | this.keyframe.element.style.left = (this.spanWidth -5) + "px"; | ||
177 | this.tweenspan.spanWidth = this.spanWidth; | ||
174 | this.element.style.left = this.spanPosition + "px"; | 178 | this.element.style.left = this.spanPosition + "px"; |
175 | this.keyframe.position = this.spanWidth; | 179 | this.keyframe.position = this.spanWidth; |
176 | this.tweenspan.spanWidth = this.spanWidth; | ||
177 | this.tweenspan.easing = this.easing; | 180 | this.tweenspan.easing = this.easing; |
178 | if(this.isTweenAnimated){ | 181 | if(this.isTweenAnimated){ |
179 | this.tweenspan.highlightSpan(); | 182 | this.tweenspan.highlightSpan(); |