sartography
/
bpmn-js
mirror of https://github.com/sartography/bpmn-js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(move-to-origin): ignore children of subprocesses 

Closes camunda/camunda-modeler#444
This commit is contained in:
Philipp Fromme 2017-01-09 14:30:39 +01:00
parent dd60e47136
commit 1f667e0184
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/features/editor-actions/BpmnEditorActions.js
View File

@ -100,7 +100,7 @@ function BpmnEditorActions(
});
} else {
elements = elementRegistry.filter(function(element) {
return element !== rootElement;
return element !== rootElement && !is(element.parent, 'bpmn:SubProcess');
});
}

21
test/spec/features/editor-actions/BpmnEditorActionsSpec.js
View File

@ -8,12 +8,14 @@ var pick = require('lodash/object/pick');
var getBBox = require('diagram-js/lib/util/Elements').getBBox;
var getParent = require('lib/features/modeling/util/ModelingUtil').getParent;
var bpmnEditorActionsModule = require('../../../../lib/features/editor-actions'),
modelingModule = require('../../../../lib/features/modeling'),
coreModule = require('../../../../lib/core');
var basicXML = require('../../../fixtures/bpmn/simple.bpmn'),
var basicXML = require('../../../fixtures/bpmn/nested-subprocesses.bpmn'),
collaborationXML = require('../../../fixtures/bpmn/collaboration.bpmn');
@ -48,6 +50,23 @@ describe('features/editor-actions', function() {
describe('collaboration', testMoveToOrigin(collaborationXML));
describe('subprocesses', function() {
beforeEach(bootstrapModeler(basicXML, { modules: [ bpmnEditorActionsModule, modelingModule, coreModule ] }));
it('should ignore children of subprocesses', inject(function(editorActions, elementRegistry) {
// given
var startEvent = elementRegistry.get('StartEvent_3'),
startEventParent = getParent(startEvent);
// when
editorActions.trigger('moveToOrigin');
// then
expect(getParent(startEvent)).to.equal(startEventParent);
}));
});
});
});