From 0e12f00d6afffabd370347335a56d0ddd17c0232 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Fri, 4 May 2012 11:00:12 -0700
Subject: Fix subproperty keyframe selection
Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
js/panels/Timeline/Tween.reel/Tween.js | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
(limited to 'js/panels/Timeline/Tween.reel')
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 8b6826ed..45714079 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -225,6 +225,8 @@ var Tween = exports.Tween = Montage.create(Component, {
selectTween:{
value: function(){
+ console.log("tween select");
+
// turn on event listener for element change
this.eventManager.addEventListener("elementChange", this, false);
@@ -243,13 +245,17 @@ var Tween = exports.Tween = Montage.create(Component, {
var currentMillisec = currentMillisecPerPixel * this.keyFramePosition;
this.application.ninja.timeline.updateTimeText(currentMillisec);
- // move animated element to correct position on stage
- var currentTop = this.tweenedProperties["top"] + "px";
- var currentLeft = this.tweenedProperties["left"] + "px";
-
- this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "top", [currentTop], "Change", "tween");
- this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "left", [currentLeft], "Change", "tween");
+ if(this.parentComponent.parentComponent.isSubproperty){
+ console.log("sub prop tween selection");
+ // set property specific style on element
+ } else {
+ // move animated element to correct position on stage
+ var currentTop = this.tweenedProperties["top"] + "px";
+ var currentLeft = this.tweenedProperties["left"] + "px";
+ this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "top", [currentTop], "Change", "tween");
+ this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "left", [currentLeft], "Change", "tween");
+ }
}
},
--
cgit v1.2.3