aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJon Reid2012-03-30 14:58:38 -0700
committerJon Reid2012-03-30 14:58:38 -0700
commitc6ef285c06905c28fe8915f9c4f916e74f6c8287 (patch)
tree86cbc34b733fa0880f53e4945992bcadbddb977a /js/panels/Timeline
parent18143071c9e1308d6cb9289477563aea22856c5e (diff)
downloadninja-c6ef285c06905c28fe8915f9c4f916e74f6c8287.tar.gz
Timeline: Link layerDragEnd and layerDrop events to better handle end of
drag-and-drop events.
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index a82d3373..3eaf3dec 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1071,8 +1071,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1071 // dragend doesn't fire. So if we're here in drop 1071 // dragend doesn't fire. So if we're here in drop
1072 // and there's still a helper, we need to manually fire dragend. 1072 // and there's still a helper, we need to manually fire dragend.
1073 if (this._dragAndDropHelper !== null) { 1073 if (this._dragAndDropHelper !== null) {
1074 this.container_layers.removeChild(this._dragAndDropHelper); 1074 this.handleLayerDragEnd(event);
1075 this._dragAndDropHelper = null;
1076 } 1075 }
1077 } 1076 }
1078 }, 1077 },