Merge branch 'master' into warp135b

platform/features/timeline/src/controllers/TimelineController.js

@@ -98,7 +98,7 @@ define(
                     });
                 }
             }
-
+            
             // Recalculate swimlane state on changes
             $scope.$watch("domainObject", swimlanePopulator.populate);
 
@@ -108,6 +108,9 @@ define(
             // Carry over changes in swimlane set to changes in graphs
             $scope.$watch(graphMask, repopulateGraphs);
 
+            // Pass selection object into swimlane populator
+            $scope.$watch("selection", swimlanePopulator.selection);
+
             // Convey current selection to drag handle populator
             $scope.$watch("selection.get()", dragPopulator.select);
 

platform/features/timeline/src/controllers/swimlane/TimelineSwimlanePopulator.js

@@ -46,7 +46,8 @@ define(
                 start = Number.POSITIVE_INFINITY,
                 end = Number.NEGATIVE_INFINITY,
                 colors = (configuration.colors || {}),
-                assigner = new TimelineColorAssigner(colors);
+                assigner = new TimelineColorAssigner(colors),
+                lastDomainObject;
 
             // Track extremes of start/end times
             function trackStartEnd(timespan) {
@@ -144,12 +145,25 @@ define(
                         domainObject && new TimelineProxy(domainObject, selection)
                     );
                 }
+
+                lastDomainObject = domainObject;
+            }
+
+            function setSelectionObject(s) {
+                selection = s;
+                recalculateSwimlanes(lastDomainObject);
             }
 
             // Ensure colors are exposed in configuration
             configuration.colors = colors;
 
             return {
+                /**
+                 * Set the selection object associated with this timeline view.
+                 * @param {Object} selection the selection object
+                 */
+                selection: setSelectionObject,
+
                 /**
                  * Update list of swimlanes to match those reachable from this
                  * object.

platform/features/timeline/src/directives/MCTSwimlaneDrop.js

@@ -85,6 +85,7 @@ define(
                     );
 
                 if (id) {
+                    event.stopPropagation();
                     // Delegate the drop to the swimlane itself
                     swimlane.drop(id, (draggedSwimlane || {}).domainObject);
                 }