From dea6554e0484e8b1cad2b27734ccc7a40d395c58 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 22 Mar 2016 12:24:08 -0700 Subject: [PATCH] [Timeline] Allow drops from tree Don't assume that all drops will be dropped swimlanes. --- .../features/timeline/src/directives/MCTSwimlaneDrop.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/features/timeline/src/directives/MCTSwimlaneDrop.js b/platform/features/timeline/src/directives/MCTSwimlaneDrop.js index cf21ac3105..e79b810890 100644 --- a/platform/features/timeline/src/directives/MCTSwimlaneDrop.js +++ b/platform/features/timeline/src/directives/MCTSwimlaneDrop.js @@ -82,12 +82,17 @@ define( ), draggedSwimlane = dndService.getData( SwimlaneDragConstants.TIMELINE_SWIMLANE_DRAG_TYPE - ); + ), + droppedObject = draggedSwimlane ? + draggedSwimlane.domainObject : + dndService.getData( + SwimlaneDragConstants.MCT_EXTENDED_DRAG_TYPE + ); if (id) { event.stopPropagation(); // Delegate the drop to the swimlane itself - swimlane.drop(id, (draggedSwimlane || {}).domainObject); + swimlane.drop(id, droppedObject); } // Clear the swimlane highlights