diff options
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index e4fb42b3..7dcd397c 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -6,7 +6,6 @@ | |||
6 | 6 | ||
7 | var Montage = require("montage/core/core").Montage; | 7 | var Montage = require("montage/core/core").Montage; |
8 | var Component = require("montage/ui/component").Component; | 8 | var Component = require("montage/ui/component").Component; |
9 | var ElementsMediator = require("js/mediators/element-mediator").ElementMediator; | ||
10 | 9 | ||
11 | var Tween = exports.Tween = Montage.create(Component, { | 10 | var Tween = exports.Tween = Montage.create(Component, { |
12 | 11 | ||
@@ -186,7 +185,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
186 | 185 | ||
187 | setAbsoluteTweenProperties:{ | 186 | setAbsoluteTweenProperties:{ |
188 | value:function (eventDetail) { | 187 | value:function (eventDetail) { |
189 | console.log(eventDetail); | 188 | //console.log(eventDetail); |
190 | if (this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"] && this.parentComponent.parentComponent.animatedElement.offsetLeft != this.tweenedProperties["left"]) { | 189 | if (this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"] && this.parentComponent.parentComponent.animatedElement.offsetLeft != this.tweenedProperties["left"]) { |
191 | this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop; | 190 | this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop; |
192 | this.tweenedProperties["left"] = this.parentComponent.parentComponent.animatedElement.offsetLeft; | 191 | this.tweenedProperties["left"] = this.parentComponent.parentComponent.animatedElement.offsetLeft; |
@@ -200,7 +199,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
200 | 199 | ||
201 | setRelativeTweenProperties:{ | 200 | setRelativeTweenProperties:{ |
202 | value:function(eventDetail){ | 201 | value:function(eventDetail){ |
203 | 202 | //console.log(eventDetail); | |
204 | } | 203 | } |
205 | }, | 204 | }, |
206 | 205 | ||
@@ -228,8 +227,8 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
228 | var currentTop = this.tweenedProperties["top"] + "px"; | 227 | var currentTop = this.tweenedProperties["top"] + "px"; |
229 | var currentLeft = this.tweenedProperties["left"] + "px"; | 228 | var currentLeft = this.tweenedProperties["left"] + "px"; |
230 | 229 | ||
231 | ElementsMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "top", [currentTop], "Change", "tween"); | 230 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "top", [currentTop], "Change", "tween"); |
232 | ElementsMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "left", [currentLeft], "Change", "tween"); | 231 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "left", [currentLeft], "Change", "tween"); |
233 | 232 | ||
234 | } | 233 | } |
235 | }, | 234 | }, |