ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-13 08:19:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[New Edit Mode] #659 Fix to prevent multi-composition with same object, fix to prevent composition of object with self

Browse Source
This commit is contained in:
Henry 2016-02-10 16:34:00 -08:00
parent 668c02f278
commit 10e0acddb3
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/containment/src/ComposeActionPolicy.js
View File

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

1
platform/features/timeline/src/directives/MCTSwimlaneDrop.js
View File

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

3
platform/features/timeline/test/directives/MCTSwimlaneDropSpec.js
View File

@ -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');