diff options
author | Jon Reid | 2012-04-10 14:52:23 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-10 14:52:23 -0700 |
commit | c19987997758cf47ac9b93a2a767a0e2a9072745 (patch) | |
tree | eb68491c5d04a5cf5ab75bedf2d6bbed3c7a3603 /js/panels/Timeline | |
parent | 03a3b32b9b0fd2dc8e4b54bfd5282fd1f8fb6ed6 (diff) | |
parent | 422b14fc60be84c116115f2e71e3499e232f3f05 (diff) | |
download | ninja-c19987997758cf47ac9b93a2a767a0e2a9072745.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 5410c77c..0a67df43 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -187,6 +187,25 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
187 | } | 187 | } |
188 | }, | 188 | }, |
189 | 189 | ||
190 | setAbsoluteTweenProperties:{ | ||
191 | value:function () { | ||
192 | if (this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"] && this.parentComponent.parentComponent.animatedElement.offsetLeft != this.tweenedProperties["left"]) { | ||
193 | this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop; | ||
194 | this.tweenedProperties["left"] = this.parentComponent.parentComponent.animatedElement.offsetLeft; | ||
195 | this.parentComponent.parentComponent.updateKeyframeRule(); | ||
196 | } | ||
197 | // highlight the tween's span | ||
198 | this.tweenspan.highlightSpan(); | ||
199 | this.isTweenAnimated = true; | ||
200 | } | ||
201 | }, | ||
202 | |||
203 | setRelativeTweenProperties:{ | ||
204 | value:function(){ | ||
205 | |||
206 | } | ||
207 | }, | ||
208 | |||
190 | selectTween:{ | 209 | selectTween:{ |
191 | value: function(){ | 210 | value: function(){ |
192 | // turn on event listener for element change | 211 | // turn on event listener for element change |