diff options
author | Jon Reid | 2012-05-17 16:53:18 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-17 16:53:18 -0700 |
commit | 91f3d92d787b79d30a6727a6ecd88d55d8047ad6 (patch) | |
tree | 95d97796e72b785e89d5d08f68f7070e1a53e0a2 /js/panels/Timeline/Tween.reel/Tween.js | |
parent | a696dffcc84b4d2719f8fa918676f9575858ca9a (diff) | |
parent | 6f86dcc9df20727155f7507f4998baee38b8d01a (diff) | |
download | ninja-91f3d92d787b79d30a6727a6ecd88d55d8047ad6.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-local
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index b61b0ca9..de6a8d56 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -271,7 +271,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
271 | // set property specific style on element | 271 | // set property specific style on element |
272 | var currentValue = this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty]; | 272 | var currentValue = this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty]; |
273 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], this.parentComponent.parentComponent.trackEditorProperty, [currentValue], "Change", "tween"); | 273 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], this.parentComponent.parentComponent.trackEditorProperty, [currentValue], "Change", "tween"); |
274 | //console.log(currentValue); | 274 | console.log(currentValue); |
275 | } else { | 275 | } else { |
276 | // move animated element to correct position on stage | 276 | // move animated element to correct position on stage |
277 | var currentTop = this.tweenedProperties["top"] + "px"; | 277 | var currentTop = this.tweenedProperties["top"] + "px"; |