Merge pull request #668 from nasa/open659

[New Edit Mode] #659 Fix to timelines

platform/containment/src/ComposeActionPolicy.js

@@ -55,11 +55,12 @@ define(
             this.policyService = this.policyService || this.getPolicyService();
 
             // ...and delegate to the composition policy
-            return this.policyService.allow(
-                'composition',
-                containerType,
-                selectedType
-            );
+            return containerObject.getId() !== selectedObject.getId() &&
+                this.policyService.allow(
+                    'composition',
+                    containerType,
+                    selectedType
+                );
         };
 
         /**

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);
                 }

platform/features/timeline/test/directives/MCTSwimlaneDropSpec.js

@@ -87,7 +87,8 @@ define(
                 testEvent = {
                     pageY: TEST_TOP + TEST_HEIGHT / 10,
                     dataTransfer: { getData: jasmine.createSpy() },
-                    preventDefault: jasmine.createSpy()
+                    preventDefault: jasmine.createSpy(),
+                    stopPropagation: jasmine.createSpy()
                 };
 
                 testEvent.dataTransfer.getData.andReturn('abc');