From 73c4f7f449ba58e70f7335ef932b23dd450c925b Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 1 May 2012 17:46:09 -0700
Subject: Timeline: Initial keyframe drag-and-drop interaction.

---
 js/panels/Timeline/Keyframe.reel/Keyframe.js | 30 +++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

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

diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
index 859cdfb1..df5bdd67 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -31,6 +31,16 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
     prepareForDraw:{
         value:function(){
             this.element.addEventListener("click", this, false);
+            
+			// Drag and drop event handlers
+			this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false);
+			this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);
+			this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
+			
+
+            
+            
+            
         }
     },
 
@@ -57,5 +67,23 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
         value:function(ev){
             this.selectKeyframe();
         }
-    }
+    },
+    
+	handleMouseover: {
+		value: function(event) {
+			this.element.draggable = true;
+		}
+	},
+	handleMouseout: {
+		value: function(event) {
+			this.element.draggable = false;
+		}
+	},
+	handleDragstart: {
+		value: function(event) {
+			//this.parentComponent.parentComponent.dragLayerID = this.layerID;
+            event.dataTransfer.setData('Text', 'Keyframe');
+		}
+	},
+    
 });
-- 
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/Keyframe.reel/Keyframe.js | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
index df5bdd67..f7259d29 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -36,6 +36,7 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
 			this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false);
 			this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);
 			this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
+			this.element.addEventListener("dragend", this.handleDragend.bind(this), false);
 			
 
             
@@ -83,7 +84,13 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
 		value: function(event) {
 			//this.parentComponent.parentComponent.dragLayerID = this.layerID;
             event.dataTransfer.setData('Text', 'Keyframe');
+            this.parentComponent.parentComponent.parentComponent.draggingIndex = this.parentComponent.tweenID;
 		}
 	},
+	handleDragend: {
+		value: function(event) {
+			this.parentComponent.isDragging = false;
+		}
+	}
     
 });
-- 
cgit v1.2.3