aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel/Tween.js
diff options
context:
space:
mode:
authorJonathan Duran2012-06-26 08:12:33 -0700
committerJonathan Duran2012-06-26 08:12:33 -0700
commit616ade06c8f669d18c27d27c3ee46a9c844a54ca (patch)
tree82ac6e3fdaedb72e067b0b8011064ac21c337567 /js/panels/Timeline/Tween.reel/Tween.js
parent831e3058a9d58c5e56066d2ff90e572be17d6f7e (diff)
downloadninja-616ade06c8f669d18c27d27c3ee46a9c844a54ca.tar.gz
Timeline Bug fixes
Fix keyframe selection updating stage for sub props. Fix tween 0 for sub props on re-open. Fix repetition mismatch for styles and position tracks. Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js4
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"];