aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
diff options
context:
space:
mode:
authorJon Reid2012-05-08 11:48:29 -0700
committerJon Reid2012-05-08 11:48:29 -0700
commit307d339e45b209dab80ff88196a9f85f8d58f425 (patch)
treeca15b20cd8053ef9525c4b788bd1ac07e9adba56 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
parent4ef8ec674695fb60c9ef6668206243471a0fe347 (diff)
downloadninja-307d339e45b209dab80ff88196a9f85f8d58f425.tar.gz
Timeline: Update drag and drop handlers to be unique for drag and drop type.
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 76d52036..03e3b01e 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -890,10 +890,14 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
890 this._appendHelper = true; 890 this._appendHelper = true;
891 this._deleteHelper = false; 891 this._deleteHelper = false;
892 this.parentComponent.parentComponent.draggingTrackId = this.trackID; 892 this.parentComponent.parentComponent.draggingTrackId = this.trackID;
893 this.parentComponent.parentComponent.draggingType = "keyframe";
893 } 894 }
894 }, 895 },
895 handleKeyframeDragend : { 896 handleKeyframeDragend : {
896 value: function(event) { 897 value: function(event) {
898 if (this.parentComponent.parentComponent.draggingType !== "keyframe") {
899 return;
900 }
897 this._deleteHelper = true; 901 this._deleteHelper = true;
898 this.needsDraw = true; 902 this.needsDraw = true;
899 903