From 778d417d2f800b91d960849c75c0e4ee128044d1 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Wed, 9 May 2012 13:33:45 -0700
Subject: Timeline: Bug fixes for keyframe drag and drop.

---
 js/panels/Timeline/Keyframe.reel/Keyframe.js | 12 +++++++++++-
 1 file changed, 11 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 f7259d29..5afff6e6 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -84,7 +84,17 @@ 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;
+            
+            // Get my index in my track's tween array
+            var i = 0,
+            	tweenRepetitionLength = this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents.length,
+            	myIndex = null;
+            for (i = 0; i < tweenRepetitionLength; i++) {
+            	if (this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents[i].uuid === this.parentComponent.uuid) {
+            		myIndex = i;
+            	}
+            }
+            this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex;
 		}
 	},
 	handleDragend: {
-- 
cgit v1.2.3