aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel
diff options
context:
space:
mode:
authorJon Reid2012-05-04 16:59:07 -0700
committerJon Reid2012-05-04 16:59:07 -0700
commit2ea8a62835f4c20efff2623306e7205e6f5bf0ba (patch)
tree3578e221b62f9a0b8f967626262108c1609ad39d /js/panels/Timeline/Tween.reel
parent0d33ff651baf062b8e82f3a89b69b3ccae0cbe47 (diff)
downloadninja-2ea8a62835f4c20efff2623306e7205e6f5bf0ba.tar.gz
Timeline: True drag-and-drop of keyframes
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js16
1 files changed, 14 insertions, 2 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index b4c3bd86..c21b5f91 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -132,11 +132,24 @@ var Tween = exports.Tween = Montage.create(Component, {
132 this._isTweenAnimated = value; 132 this._isTweenAnimated = value;
133 } 133 }
134 }, 134 },
135
136 _isDragging: {
137 value: false
138 },
139 isDragging: {
140 serializable: true,
141 get:function () {
142 return this._isDragging;
143 },
144 set:function (newVal) {
145 this._isDragging = newVal;
146 }
147
148 },
135 149
136 150
137 draw:{ 151 draw:{
138 value:function () { 152 value:function () {
139 console.log("Tween.draw")
140 this.element.style.left = this.spanPosition + "px"; 153 this.element.style.left = this.spanPosition + "px";
141 this.keyframe.position = this.spanWidth; 154 this.keyframe.position = this.spanWidth;
142 this.tweenspan.spanWidth = this.spanWidth; 155 this.tweenspan.spanWidth = this.spanWidth;
@@ -148,7 +161,6 @@ var Tween = exports.Tween = Montage.create(Component, {
148 161
149 setData:{ 162 setData:{
150 value:function(){ 163 value:function(){
151 console.log("Tween.setData")
152 this.spanWidth = this.tweenData.spanWidth; 164 this.spanWidth = this.tweenData.spanWidth;
153 this.keyFramePosition = this.tweenData.keyFramePosition; 165 this.keyFramePosition = this.tweenData.keyFramePosition;
154 this.spanPosition = this.tweenData.spanPosition; 166 this.spanPosition = this.tweenData.spanPosition;