From fb2a3f528b977bf0b9928ca4d17b8895a1755e3c Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Fri, 15 Jun 2012 01:43:54 -0700
Subject: Fix sub prop re-open for tweens

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 .../Timeline/PropertyTrack.reel/PropertyTrack.js      | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js')

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 0ad0f34e..37472da8 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -309,27 +309,19 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
 
     retrieveStoredStyleTweens:{
         value:function(){
-            console.log("retrieving style tweens");
+            console.log("retrieving style tweens " + this.animatedElement + " - " + this.currentKeyframeRule.name);
             console.log(this.currentKeyframeRule);
 
-
             var percentValue, fraction, splitValue;
             var currentMilliSec, currentMilliSecPerPixel, clickPosition, tempTiming, tempTimingFloat, trackTiming, i = 0;
 
             if (this.animatedElement !== undefined) {
-
-                //this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name");
-
-                // build tweens for this tracks's keyframe rule
+                this.animationName = this.currentKeyframeRule.name;
                 if (this.animationName) {
 
-
-
                     trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration");
                     this.nextKeyframe = 0;
 
-                    this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument.model.views.design.document);
-
                     for (i = 0; this.currentKeyframeRule[i]; i++) {
                         var newTween = {};
                         newTween.tweenData = {};
@@ -361,7 +353,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
                             newTween.tweenData.keyFrameMillisec = 0;
                             newTween.tweenData.tweenID = 0;
                             newTween.tweenData.spanPosition = 0;
-                            this.tweens.push(newTween);
+                            this.propTweens.push(newTween);
                         }
                         else {
                             tempTiming = trackTiming.split("s");
@@ -373,16 +365,15 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
                             currentMilliSec = fraction * this.trackDuration;
                             currentMilliSecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
                             clickPosition = currentMilliSec / currentMilliSecPerPixel;
-                            newTween.tweenData.spanWidth = clickPosition - this.tweens[this.tweens.length - 1].tweenData.keyFramePosition;
+                            newTween.tweenData.spanWidth = clickPosition - this.propTweens[this.propTweens.length - 1].tweenData.keyFramePosition;
                             newTween.tweenData.keyFramePosition = clickPosition;
                             newTween.tweenData.keyFrameMillisec = currentMilliSec;
                             newTween.tweenData.tweenID = this.nextKeyframe;
                             newTween.tweenData.spanPosition = clickPosition - newTween.tweenData.spanWidth;
-                            this.tweens.push(newTween);
+                            this.propTweens.push(newTween);
                         }
                         this.nextKeyframe += 1;
                     }
-                    this.isTrackAnimated = true;
                 }
             }
         }
-- 
cgit v1.2.3