ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-31 00:23:54 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #668 from nasa/open659

Browse Source 
[New Edit Mode] #659 Fix to timelines
This commit is contained in:
Victor Woeltjen 2016-02-10 17:02:28 -08:00
commit 5306e96374
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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