2 files changed, 20 insertions, 10 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 83d4ce73..60da4e71 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -35,6 +35,10 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
         value:null
     },
 
+    isSubproperty:{
+        value:true
+    },
+
     propTweenRepetition:{
         serializable:true,
         get:function () {
@@ -111,11 +115,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
 
     handleClick:{
         value:function(ev){
-            var parentTrackID = this.parentComponent.parentComponent.parentComponent.trackID;
-            var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(parentTrackID);
             //console.log(this.application.ninja.timeline.arrLayers[selectedIndex].layerData);
-            this.application.ninja.timeline.selectLayer(selectedIndex, true);
-
             if (ev.shiftKey) {
                 if (this.propTweens.length < 1) {
                     this.insertPropTween(0);
@@ -137,6 +137,10 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
 
     insertPropTween:{
         value:function(clickPos){
+            var parentTrackID = this.parentComponent.parentComponent.parentComponent.trackID;
+            var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(parentTrackID);
+            this.application.ninja.timeline.selectLayer(selectedIndex, true);
+
             var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
             var currentMillisec = currentMillisecPerPixel * clickPos;
 
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");
+            }
         }
     },