From 7fc185cc08b2ba912dbc7bce96f6a465c1dd6dbf Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 3 May 2012 18:06:06 -0700
Subject: Timeline: More work on tween drag-and-drop

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

(limited to 'js/panels/Timeline/Tween.reel/Tween.js')

diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 8b6826ed..b4c3bd86 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -136,6 +136,7 @@ var Tween = exports.Tween = Montage.create(Component, {
 
     draw:{
         value:function () {
+        	console.log("Tween.draw")
             this.element.style.left = this.spanPosition + "px";
             this.keyframe.position = this.spanWidth;
             this.tweenspan.spanWidth = this.spanWidth;
@@ -147,6 +148,7 @@ var Tween = exports.Tween = Montage.create(Component, {
 
     setData:{
         value:function(){
+        	console.log("Tween.setData")
             this.spanWidth = this.tweenData.spanWidth;
             this.keyFramePosition = this.tweenData.keyFramePosition;
             this.spanPosition = this.tweenData.spanPosition;
-- 
cgit v1.2.3


From 2ea8a62835f4c20efff2623306e7205e6f5bf0ba Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 4 May 2012 16:59:07 -0700
Subject: Timeline: True drag-and-drop of keyframes

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

(limited to 'js/panels/Timeline/Tween.reel/Tween.js')

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, {
             this._isTweenAnimated = value;
         }
     },
+    
+    _isDragging: {
+    	value: false
+    },
+    isDragging: {
+    	serializable: true,
+        get:function () {
+            return this._isDragging;
+        },
+        set:function (newVal) {
+            this._isDragging = newVal;
+        }
+    	
+    },
 
 
     draw:{
         value:function () {
-        	console.log("Tween.draw")
             this.element.style.left = this.spanPosition + "px";
             this.keyframe.position = this.spanWidth;
             this.tweenspan.spanWidth = this.spanWidth;
@@ -148,7 +161,6 @@ var Tween = exports.Tween = Montage.create(Component, {
 
     setData:{
         value:function(){
-        	console.log("Tween.setData")
             this.spanWidth = this.tweenData.spanWidth;
             this.keyFramePosition = this.tweenData.keyFramePosition;
             this.spanPosition = this.tweenData.spanPosition;
-- 
cgit v1.2.3