Timeline: Disable drag-and-drop on subproperty keyframes. Better error

handling. Fix some minor bugs.

1 files changed, 12 insertions, 0 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 12e87636..9ee9b922 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -192,6 +192,11 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
             this.trackID = this.timelineTrack.trackID;
             this.animatedElement = this.timelineTrack.animatedElement;
             this.ninjaStylesContoller = this.application.ninja.stylesController;
+            
+                        // Drag and Drop event handlers
+            this.element.addEventListener("dragstart", this.handleKeyframeDragstart.bind(this), false);
+            this.element.addEventListener("dragend", this.handleKeyframeDragstart.bind(this), false);
+            this.element.addEventListener("drop", this.handleKeyframeDragstart.bind(this), false);
         }
     },
 
@@ -206,6 +211,13 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
     /* End: Draw Cycle */
 
     /* Begin: Event Handlers */
+   
+    handleKeyframeDragstart: {
+        value: function(event) {
+            event.stopPropagation();
+            return false;
+        }
+    },
 
     handleClick:{
         value:function (ev) {