diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 1 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 19709ca7..8ddc81cd 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -31,6 +31,7 @@ | |||
31 | "container_tracks" : {"#" : "container-tracks"}, | 31 | "container_tracks" : {"#" : "container-tracks"}, |
32 | "end_hottext" : {"@" : "endHottext"}, | 32 | "end_hottext" : {"@" : "endHottext"}, |
33 | "container_layers" : {"#" : "container-layers"}, | 33 | "container_layers" : {"#" : "container-layers"}, |
34 | "container_tracks" : {"#" : "container-tracks"}, | ||
34 | "timeline_disabler" : {"#" : "timeline-disabler"}, | 35 | "timeline_disabler" : {"#" : "timeline-disabler"}, |
35 | "checkable_relative" : {"#" : "checkable_relative"}, | 36 | "checkable_relative" : {"#" : "checkable_relative"}, |
36 | "checkable_absolute" : {"#" : "checkable_absolute"}, | 37 | "checkable_absolute" : {"#" : "checkable_absolute"}, |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 6e64cde0..80baffc8 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -336,6 +336,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
336 | this.container_layers.addEventListener("dragstart", this.handleLayerDragStart.bind(this), false); | 336 | this.container_layers.addEventListener("dragstart", this.handleLayerDragStart.bind(this), false); |
337 | this.container_layers.addEventListener("dragend", this.handleLayerDragEnd.bind(this), false); | 337 | this.container_layers.addEventListener("dragend", this.handleLayerDragEnd.bind(this), false); |
338 | this.container_layers.addEventListener("dragover", this.handleLayerDragover.bind(this), false); | 338 | this.container_layers.addEventListener("dragover", this.handleLayerDragover.bind(this), false); |
339 | //this.container_tracks.addEventListener("dragover", this.handleKeyframeDragover.bind(this), false); | ||
339 | this.container_layers.addEventListener("drop", this.handleLayerDrop.bind(this), false); | 340 | this.container_layers.addEventListener("drop", this.handleLayerDrop.bind(this), false); |
340 | 341 | ||
341 | // Bind the handlers for the config menu | 342 | // Bind the handlers for the config menu |
@@ -1471,6 +1472,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1471 | this.needsDraw = true; | 1472 | this.needsDraw = true; |
1472 | } | 1473 | } |
1473 | }, | 1474 | }, |
1475 | handleKeyframeDragover: { | ||
1476 | value: function(event) { | ||
1477 | |||
1478 | } | ||
1479 | }, | ||
1474 | handleLayerDragEnd : { | 1480 | handleLayerDragEnd : { |
1475 | value: function(event) { | 1481 | value: function(event) { |
1476 | this._deleteHelper = true; | 1482 | this._deleteHelper = true; |