From 0b41d5c873b25461e2217782af1c410b89cb56de Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 15 Jun 2012 14:03:03 -0700
Subject: Timeline: Bug fix IKNINJA 1716, "Ease options are not correctly
 displayed in Timeline after a file is saved and re-opened."

---
 js/panels/Timeline/Tween.reel/Tween.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(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 49cfa9c9..d96cc932 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -154,12 +154,27 @@ var Tween = exports.Tween = Montage.create(Component, {
         }
     	
     },
+    
+    _easing: {
+    	value: false
+    },
+    easing: {
+    	serializable: true,
+        get:function () {
+            return this._easing;
+        },
+        set:function (newVal) {
+            this._easing = newVal;
+        }
+    	
+    },
 
     draw:{
         value:function () {
             this.element.style.left = this.spanPosition + "px";
             this.keyframe.position = this.spanWidth;
             this.tweenspan.spanWidth = this.spanWidth;
+            this.tweenspan.easing = this.easing;
             if(this.isTweenAnimated){
                 this.tweenspan.highlightSpan();
             }
@@ -175,6 +190,7 @@ var Tween = exports.Tween = Montage.create(Component, {
             this.tweenID = this.tweenData.tweenID;
             this.tweenedProperties = this.tweenData.tweenedProperties;
             this.isTweenAnimated = this.tweenData.isTweenAnimated;
+            this.easing = this.tweenData.easing;
             this.needsDraw = true;
         }
     },
-- 
cgit v1.2.3