diff options
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 49cfa9c9..d96cc932 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -154,12 +154,27 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
154 | } | 154 | } |
155 | 155 | ||
156 | }, | 156 | }, |
157 | |||
158 | _easing: { | ||
159 | value: false | ||
160 | }, | ||
161 | easing: { | ||
162 | serializable: true, | ||
163 | get:function () { | ||
164 | return this._easing; | ||
165 | }, | ||
166 | set:function (newVal) { | ||
167 | this._easing = newVal; | ||
168 | } | ||
169 | |||
170 | }, | ||
157 | 171 | ||
158 | draw:{ | 172 | draw:{ |
159 | value:function () { | 173 | value:function () { |
160 | this.element.style.left = this.spanPosition + "px"; | 174 | this.element.style.left = this.spanPosition + "px"; |
161 | this.keyframe.position = this.spanWidth; | 175 | this.keyframe.position = this.spanWidth; |
162 | this.tweenspan.spanWidth = this.spanWidth; | 176 | this.tweenspan.spanWidth = this.spanWidth; |
177 | this.tweenspan.easing = this.easing; | ||
163 | if(this.isTweenAnimated){ | 178 | if(this.isTweenAnimated){ |
164 | this.tweenspan.highlightSpan(); | 179 | this.tweenspan.highlightSpan(); |
165 | } | 180 | } |
@@ -175,6 +190,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
175 | this.tweenID = this.tweenData.tweenID; | 190 | this.tweenID = this.tweenData.tweenID; |
176 | this.tweenedProperties = this.tweenData.tweenedProperties; | 191 | this.tweenedProperties = this.tweenData.tweenedProperties; |
177 | this.isTweenAnimated = this.tweenData.isTweenAnimated; | 192 | this.isTweenAnimated = this.tweenData.isTweenAnimated; |
193 | this.easing = this.tweenData.easing; | ||
178 | this.needsDraw = true; | 194 | this.needsDraw = true; |
179 | } | 195 | } |
180 | }, | 196 | }, |