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

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
platform
containment/src
features/timeline
src/directives
test/directives

View File

@ -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
);
};
/**

View File

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

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