Merge branch 'refs/heads/master' into AddAnimationsLibrary

Conflicts:
	js/panels/presets/default-transition-presets.js

1 files changed, 31 insertions, 19 deletions

diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 6ff38bef..2b308d9a 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -14,6 +14,24 @@ var Tween = exports.Tween = Montage.create(Component, {
         value: true
     },
 
+    _tweenData:{
+        serializable: true,
+        value:{}
+    },
+
+    tweenData:{
+        serializable: true,
+        get:function(){
+            return this._tweenData;
+        },
+        set:function(val){
+            this._tweenData = val;
+            if(this._tweenData){
+                this.setData();
+            }
+        }
+    },
+
     _spanWidth: {
         serializable: true,
         value: 0
@@ -26,7 +44,6 @@ var Tween = exports.Tween = Montage.create(Component, {
         },
         set: function(value){
             this._spanWidth = value;
-            this.needsDraw = true;
         }
     },
 
@@ -41,7 +58,6 @@ var Tween = exports.Tween = Montage.create(Component, {
         },
         set:function (value) {
             this._spanPosition = value;
-            this.needsDraw = true;
         }
     },
 
@@ -56,7 +72,6 @@ var Tween = exports.Tween = Montage.create(Component, {
         },
         set:function (value) {
             this._keyFramePosition = value;
-            this.needsDraw = true;
         }
     },
 
@@ -115,24 +130,8 @@ var Tween = exports.Tween = Montage.create(Component, {
         },
         set:function (value) {
             this._isTweenAnimated = value;
-            this.needsDraw = true;
         }
     },
-    
-    _isClearing : {
-        serializable: true,
-        value: false
-    },
-    isClearing : {
-        get: function() {
-                return this._isClearing;
-        },
-        set: function(newVal) {
-                if (newVal === "clear it") {
-                        this.eventManager.removeEventListener("elementChange", this, false);
-                }
-        }
-    },
 
     draw:{
         value:function () {
@@ -145,6 +144,19 @@ var Tween = exports.Tween = Montage.create(Component, {
         }
     },
 
+    setData:{
+        value:function(){
+            this.spanWidth = this.tweenData.spanWidth;
+            this.keyFramePosition = this.tweenData.keyFramePosition;
+            this.spanPosition = this.tweenData.spanPosition;
+            this.keyFrameMillisec = this.tweenData.keyFrameMillisec;
+            this.tweenID = this.tweenData.tweenID;
+            this.tweenedProperties = this.tweenData.tweenedProperties;
+            this.isTweenAnimated = this.tweenData.isTweenAnimated;
+            this.needsDraw = true;
+        }
+    },
+
     handleElementChange:{
         value:function (event) {