1 files changed, 12 insertions, 6 deletions

diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index c21b5f91..c733b8d7 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -239,6 +239,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);
 
@@ -257,13 +259,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");
+            }
         }
     },