aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-06-19 08:40:44 -0700
committerJonathan Duran2012-06-19 08:40:44 -0700
commit53a49f49ce5cd72fbb21e2840bb9622d5952d953 (patch)
treef1af9c311e7a72a03e3e521a88410fd75aca05e8 /js/panels/Timeline/Tween.reel
parent6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (diff)
parente600253fa8e6027c4bac7ebb69e0d4ce12a76ff8 (diff)
downloadninja-53a49f49ce5cd72fbb21e2840bb9622d5952d953.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 51a9e215..dcc139a5 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -110,6 +110,7 @@ var Tween = exports.Tween = Montage.create(Component, {
110 }, 110 },
111 set:function (value) { 111 set:function (value) {
112 this._tweenID = value; 112 this._tweenID = value;
113 this.tweenData.tweenID = value;
113 } 114 }
114 }, 115 },
115 116
@@ -156,7 +157,7 @@ var Tween = exports.Tween = Montage.create(Component, {
156 }, 157 },
157 158
158 _easing: { 159 _easing: {
159 value: "ease-in" 160 value: "none"
160 }, 161 },
161 easing: { 162 easing: {
162 serializable: true, 163 serializable: true,
@@ -171,9 +172,11 @@ var Tween = exports.Tween = Montage.create(Component, {
171 172
172 draw:{ 173 draw:{
173 value:function () { 174 value:function () {
175 this.tweenspan.element.style.width = this.spanWidth + "px";
176 this.keyframe.element.style.left = (this.spanWidth -5) + "px";
177 this.tweenspan.spanWidth = this.spanWidth;
174 this.element.style.left = this.spanPosition + "px"; 178 this.element.style.left = this.spanPosition + "px";
175 this.keyframe.position = this.spanWidth; 179 this.keyframe.position = this.spanWidth;
176 this.tweenspan.spanWidth = this.spanWidth;
177 this.tweenspan.easing = this.easing; 180 this.tweenspan.easing = this.easing;
178 if(this.isTweenAnimated){ 181 if(this.isTweenAnimated){
179 this.tweenspan.highlightSpan(); 182 this.tweenspan.highlightSpan();