diff options
author | Kruti Shah | 2012-06-26 09:46:59 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-26 09:46:59 -0700 |
commit | 4b4a95140d52e191e5e637371dfc369e50e7f9c8 (patch) | |
tree | 274b55f66527a9925032c5d6da4baa6f12be8ada /js/panels/Timeline/Tween.reel/Tween.js | |
parent | 4bf8e4cdc179c3b388fc06f26008808aa4b77eb0 (diff) | |
parent | f0d4d89d856b99da1ca8dd3366c48bb76ba6b1f6 (diff) | |
download | ninja-4b4a95140d52e191e5e637371dfc369e50e7f9c8.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index c0949f93..682a8619 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -316,7 +316,9 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
316 | if(this.parentComponent.parentComponent.isSubproperty){ | 316 | if(this.parentComponent.parentComponent.isSubproperty){ |
317 | // set property specific style on element | 317 | // set property specific style on element |
318 | var currentValue = this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty]; | 318 | 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"); | 319 | var el = this.parentComponent.parentComponent.animatedElement; |
320 | var prop = this.parentComponent.parentComponent.trackEditorProperty; | ||
321 | this.application.ninja.elementMediator.setProperty([el], prop, [currentValue], "Change", "tween"); | ||
320 | } else { | 322 | } else { |
321 | // move animated element to correct position on stage | 323 | // move animated element to correct position on stage |
322 | var currentTop = this.tweenedProperties["top"]; | 324 | var currentTop = this.tweenedProperties["top"]; |