From 4438dae53bb528d94b9f21272f7c240dd546b0a8 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Mon, 14 May 2012 23:51:34 -0700
Subject: handle more prop types in subgroup keyframe rules

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 .../Timeline/PropertyTrack.reel/PropertyTrack.js      |  3 ++-
 js/panels/Timeline/Tween.reel/Tween.js                | 19 +++++--------------
 2 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'js/panels/Timeline')

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 8d2c1918..43370a64 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -225,6 +225,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
                 newTween.tweenData.tweenID = 0;
                 newTween.tweenData.spanPosition = 0;
                 newTween.tweenData.tweenedProperties = [];
+                newTween.tweenData.tweenedProperties[this.trackEditorProperty] = this.ninjaStylesContoller.getElementStyle(this.animatedElement, this.trackEditorProperty);
 
                 this.propTweens.push(newTween);
 
@@ -290,7 +291,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
 
             this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", newAnimationNames);
 
-            this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", newAnimationDuration);
+            //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", newAnimationDuration);
             //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", newIterationCount);
             //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "both");
             //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-transition-timing-function", "linear");
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 846c2f1c..63dabefe 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -201,28 +201,18 @@ var Tween = exports.Tween = Montage.create(Component, {
 
     setAbsoluteTweenProperties:{
         value:function (eventDetail) {
-            //console.log(eventDetail);
-
-            // top
             if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){
                 this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop;
             }
-
-            // left
             if(this.parentComponent.parentComponent.animatedElement.offsetLeft != this.tweenedProperties["left"]){
                 this.tweenedProperties["left"] = this.parentComponent.parentComponent.animatedElement.offsetLeft;
             }
-
-            // width
             if (this.parentComponent.parentComponent.animatedElement.offsetWidth != this.tweenedProperties["width"]){
                 this.tweenedProperties["width"] = this.parentComponent.parentComponent.animatedElement.offsetWidth;
             }
-
-            // height
             if (this.parentComponent.parentComponent.animatedElement.offsetHeight != this.tweenedProperties["height"]){
                 this.tweenedProperties["height"] = this.parentComponent.parentComponent.animatedElement.offsetHeight;
             }
-
             // tell track to update css rule
             this.parentComponent.parentComponent.updateKeyframeRule();
 
@@ -247,21 +237,22 @@ var Tween = exports.Tween = Montage.create(Component, {
                 // ignore top, left, width, and height
                 console.log(eventDetail.data.value[0]);
                 this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty] = eventDetail.data.value[0];
-                console.log(this.tweenedProperties);
+                this.parentComponent.parentComponent.updatePropKeyframeRule();
+
             } else if(eventDetail.type == "setColor"){
                 var prop = this.parentComponent.parentComponent.trackEditorProperty;
                 this.tweenedProperties[prop] = eventDetail.data.value.color.css;
                 this.parentComponent.parentComponent.updatePropKeyframeRule();
+
             } else if(eventDetail.type == "setProperty"){
                 // ignore top, left, width, and height
                 console.log(eventDetail.data.value[0]);
                 this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty] = eventDetail.data.value[0];
-                console.log(this.tweenedProperties);
+                this.parentComponent.parentComponent.updatePropKeyframeRule();
+
             }else {
                 console.log("TWEEN Unhandled type - setStyleTweenProperty : " + eventDetail.type);
             }
-
-
         }
     },
 
-- 
cgit v1.2.3