diff options
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index c0949f93..2d4ae75d 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -206,7 +206,6 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
206 | if (event.detail.source && event.detail.source !== "tween") { | 206 | if (event.detail.source && event.detail.source !== "tween") { |
207 | 207 | ||
208 | if(this.parentComponent.parentComponent.isSubproperty){ | 208 | if(this.parentComponent.parentComponent.isSubproperty){ |
209 | console.log("setting style tween property") | ||
210 | this.setStyleTweenProperty(event.detail); | 209 | this.setStyleTweenProperty(event.detail); |
211 | } else { | 210 | } else { |
212 | // check for correct element selection | 211 | // check for correct element selection |
@@ -316,7 +315,9 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
316 | if(this.parentComponent.parentComponent.isSubproperty){ | 315 | if(this.parentComponent.parentComponent.isSubproperty){ |
317 | // set property specific style on element | 316 | // set property specific style on element |
318 | var currentValue = this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty]; | 317 | var currentValue = this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty]; |
319 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], this.parentComponent.parentComponent.trackEditorProperty, [currentValue], "Change", "tween"); | 318 | var el = this.parentComponent.parentComponent.animatedElement; |
319 | var prop = this.parentComponent.parentComponent.trackEditorProperty; | ||
320 | this.application.ninja.elementMediator.setProperty([el], prop, [currentValue], "Change", "tween"); | ||
320 | } else { | 321 | } else { |
321 | // move animated element to correct position on stage | 322 | // move animated element to correct position on stage |
322 | var currentTop = this.tweenedProperties["top"]; | 323 | var currentTop = this.tweenedProperties["top"]; |