diff options
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 89f18f98..0d189fba 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -170,6 +170,29 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
170 | 170 | ||
171 | }, | 171 | }, |
172 | 172 | ||
173 | _initSelect:{ | ||
174 | value: null | ||
175 | }, | ||
176 | initSelect:{ | ||
177 | serializable:true, | ||
178 | get:function () { | ||
179 | return this._initSelect; | ||
180 | }, | ||
181 | set:function (newVal) { | ||
182 | this._initSelect = newVal; | ||
183 | this.tweenData.initSelect = newVal; | ||
184 | } | ||
185 | }, | ||
186 | |||
187 | prepareForDraw:{ | ||
188 | value:function(){ | ||
189 | if(this.initSelect){ | ||
190 | this.keyframe.selectKeyframe(); | ||
191 | this.initSelect = false; | ||
192 | } | ||
193 | } | ||
194 | }, | ||
195 | |||
173 | draw:{ | 196 | draw:{ |
174 | value:function () { | 197 | value:function () { |
175 | this.tweenspan.element.style.width = this.spanWidth + "px"; | 198 | this.tweenspan.element.style.width = this.spanWidth + "px"; |
@@ -194,6 +217,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
194 | this.tweenedProperties = this.tweenData.tweenedProperties; | 217 | this.tweenedProperties = this.tweenData.tweenedProperties; |
195 | this.isTweenAnimated = this.tweenData.isTweenAnimated; | 218 | this.isTweenAnimated = this.tweenData.isTweenAnimated; |
196 | this.easing = this.tweenData.easing; | 219 | this.easing = this.tweenData.easing; |
220 | this.initSelect = this.tweenData.initSelect; | ||
197 | this.needsDraw = true; | 221 | this.needsDraw = true; |
198 | } | 222 | } |
199 | }, | 223 | }, |
@@ -244,7 +268,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
244 | this.isTweenAnimated = true; | 268 | this.isTweenAnimated = true; |
245 | } | 269 | } |
246 | 270 | ||
247 | if (eventDetail.source === "translateTool") { | 271 | if (eventDetail.source === "translateTool" || eventDetail.source === "rotateTool") { |
248 | var arrMat = eventDetail.data.value[0].properties.mat, | 272 | var arrMat = eventDetail.data.value[0].properties.mat, |
249 | strTweenProperty = "perspective(1400) matrix3d(" + arrMat.join() + ")"; | 273 | strTweenProperty = "perspective(1400) matrix3d(" + arrMat.join() + ")"; |
250 | 274 | ||