aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJon Reid2012-06-15 14:03:03 -0700
committerJon Reid2012-06-15 14:03:03 -0700
commit0b41d5c873b25461e2217782af1c410b89cb56de (patch)
tree501170ae0fc3a0609e2cb6184af7510d0f7075ff /js/panels
parent8dc456d59bd7dfc9c080a0241fa72d89aa4db70e (diff)
downloadninja-0b41d5c873b25461e2217782af1c410b89cb56de.tar.gz
Timeline: Bug fix IKNINJA 1716, "Ease options are not correctly displayed in
Timeline after a file is saved and re-opened."
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/Span.reel/Span.js1
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js1
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js16
3 files changed, 17 insertions, 1 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js
index 7347ef51..5b0f3f94 100644
--- a/js/panels/Timeline/Span.reel/Span.js
+++ b/js/panels/Timeline/Span.reel/Span.js
@@ -83,7 +83,6 @@ var Span = exports.Span = Montage.create(Component, {
83 83
84 draw:{ 84 draw:{
85 value: function(){ 85 value: function(){
86
87 this.element.style.width = this.spanWidth + "px"; 86 this.element.style.width = this.spanWidth + "px";
88 87
89 if ((this.spanWidth <= 70) && (this.spanWidth >0)) { 88 if ((this.spanWidth <= 70) && (this.spanWidth >0)) {
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index fc88b779..695f13ac 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -879,6 +879,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
879 newTween.tweenData.keyFrameMillisec = currentMilliSec; 879 newTween.tweenData.keyFrameMillisec = currentMilliSec;
880 newTween.tweenData.tweenID = this.nextKeyframe; 880 newTween.tweenData.tweenID = this.nextKeyframe;
881 newTween.tweenData.spanPosition =clickPosition - newTween.tweenData.spanWidth; 881 newTween.tweenData.spanPosition =clickPosition - newTween.tweenData.spanWidth;
882 newTween.tweenData.easing = this.currentKeyframeRule[i].style.webkitAnimationName;
882 this.tweens.push(newTween); 883 this.tweens.push(newTween);
883 } 884 }
884 this.nextKeyframe += 1; 885 this.nextKeyframe += 1;
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, {
154 } 154 }
155 155
156 }, 156 },
157
158 _easing: {
159 value: false
160 },
161 easing: {
162 serializable: true,
163 get:function () {
164 return this._easing;
165 },
166 set:function (newVal) {
167 this._easing = newVal;
168 }
169
170 },
157 171
158 draw:{ 172 draw:{
159 value:function () { 173 value:function () {
160 this.element.style.left = this.spanPosition + "px"; 174 this.element.style.left = this.spanPosition + "px";
161 this.keyframe.position = this.spanWidth; 175 this.keyframe.position = this.spanWidth;
162 this.tweenspan.spanWidth = this.spanWidth; 176 this.tweenspan.spanWidth = this.spanWidth;
177 this.tweenspan.easing = this.easing;
163 if(this.isTweenAnimated){ 178 if(this.isTweenAnimated){
164 this.tweenspan.highlightSpan(); 179 this.tweenspan.highlightSpan();
165 } 180 }
@@ -175,6 +190,7 @@ var Tween = exports.Tween = Montage.create(Component, {
175 this.tweenID = this.tweenData.tweenID; 190 this.tweenID = this.tweenData.tweenID;
176 this.tweenedProperties = this.tweenData.tweenedProperties; 191 this.tweenedProperties = this.tweenData.tweenedProperties;
177 this.isTweenAnimated = this.tweenData.isTweenAnimated; 192 this.isTweenAnimated = this.tweenData.isTweenAnimated;
193 this.easing = this.tweenData.easing;
178 this.needsDraw = true; 194 this.needsDraw = true;
179 } 195 }
180 }, 196 },