Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 25 insertions, 1 deletions

diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 89f18f98..0d189fba 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -170,6 +170,29 @@ var Tween = exports.Tween = Montage.create(Component, {
         
     },
 
+    _initSelect:{
+        value: null
+    },
+    initSelect:{
+        serializable:true,
+        get:function () {
+            return this._initSelect;
+        },
+        set:function (newVal) {
+            this._initSelect = newVal;
+            this.tweenData.initSelect = newVal;
+        }
+    },
+
+    prepareForDraw:{
+        value:function(){
+            if(this.initSelect){
+                this.keyframe.selectKeyframe();
+                this.initSelect = false;
+            }
+        }
+    },
+
     draw:{
         value:function () {
                 this.tweenspan.element.style.width = this.spanWidth + "px";
@@ -194,6 +217,7 @@ var Tween = exports.Tween = Montage.create(Component, {
             this.tweenedProperties = this.tweenData.tweenedProperties;
             this.isTweenAnimated = this.tweenData.isTweenAnimated;
             this.easing = this.tweenData.easing;
+            this.initSelect = this.tweenData.initSelect;
             this.needsDraw = true;
         }
     },
@@ -244,7 +268,7 @@ var Tween = exports.Tween = Montage.create(Component, {
                     this.isTweenAnimated = true;
                 }
                         
-                        if (eventDetail.source === "translateTool") {
+                        if (eventDetail.source === "translateTool" || eventDetail.source === "rotateTool") {
                         var arrMat = eventDetail.data.value[0].properties.mat,
                                 strTweenProperty = "perspective(1400) matrix3d(" + arrMat.join() + ")";