Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

1 files changed, 79 insertions, 10 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 59bc14e4..0ad0f34e 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -30,15 +30,8 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
 
     didDraw:{
         value:function () {
-            if ((!this.application.ninja.documentController.creatingNewFile) || (!this.application.ninja.currentDocument.setLevel)) {
-                if (this.application.ninja.currentDocument.model.documentRoot.children[0]) {
-                    var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
-                    if (selectedIndex !== false) {
-                        if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) {
-                            this.retrieveStoredStyleTweens();
-                        }
-                    }
-                }
+            if(this.currentKeyframeRule){
+                this.retrieveStoredStyleTweens();
             }
         }
     },
@@ -178,6 +171,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
             this.propTweens = this.propTrackData.propTweens;
             this.trackType = this.propTrackData.trackType;
             this.trackEditorProperty = this.propTrackData.trackEditorProperty;
+            this.currentKeyframeRule = this.propTrackData.existingRule;
             this.needsDraw = true;
         }
     },
@@ -315,7 +309,82 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
 
     retrieveStoredStyleTweens:{
         value:function(){
-            console.log("retrieve style tweens");
+            console.log("retrieving style tweens");
+            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
+                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 = {};
+
+                        var j, styleLength = this.currentKeyframeRule[i].style.length, keyframeStyles = [];
+
+                        for (j = 0; j < styleLength; j++) {
+
+                            // check for vendor prefixes and skip them for now
+                            var firstChar = this.currentKeyframeRule[i].style[j].charAt(0);
+                            if (firstChar === "-") {
+                                break;
+                            } else {
+                                var currProp = this.currentKeyframeRule[i].style[j];
+                                var propVal = this.currentKeyframeRule[i].style[currProp];
+                                keyframeStyles.push([currProp, propVal]);
+                            }
+                        }
+
+                        // recreate tween properties array for timeline tween
+                        newTween.tweenData.tweenedProperties = [];
+                        for (var k in keyframeStyles) {
+                            newTween.tweenData.tweenedProperties[keyframeStyles[k][0]] = keyframeStyles[k][1];
+                        }
+
+                        if (this.currentKeyframeRule[i].keyText === "0%") {
+                            newTween.tweenData.spanWidth = 0;
+                            newTween.tweenData.keyFramePosition = 0;
+                            newTween.tweenData.keyFrameMillisec = 0;
+                            newTween.tweenData.tweenID = 0;
+                            newTween.tweenData.spanPosition = 0;
+                            this.tweens.push(newTween);
+                        }
+                        else {
+                            tempTiming = trackTiming.split("s");
+                            tempTimingFloat = parseFloat(tempTiming[0]);
+                            this.trackDuration = tempTimingFloat * 1000;
+                            percentValue = this.currentKeyframeRule[i].keyText;
+                            splitValue = percentValue.split("%");
+                            fraction = splitValue[0] / 100;
+                            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.keyFramePosition = clickPosition;
+                            newTween.tweenData.keyFrameMillisec = currentMilliSec;
+                            newTween.tweenData.tweenID = this.nextKeyframe;
+                            newTween.tweenData.spanPosition = clickPosition - newTween.tweenData.spanWidth;
+                            this.tweens.push(newTween);
+                        }
+                        this.nextKeyframe += 1;
+                    }
+                    this.isTrackAnimated = true;
+                }
+            }
         }
     },