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

Merge master to develop

This commit is contained in:
bpmn-io-bot 2022-03-23 11:13:57 +00:00
parent 840fec65bd 574a674381
commit 85ae96b49a
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/features/drilldown/DrilldownOverlayBehavior.js
View File

@ -80,7 +80,7 @@ export default function DrilldownOverlayBehavior(
}, true);
eventBus.on('import.done', function() {
eventBus.on('import.render.complete', function() {
elementRegistry.filter(function(e) {
return self.canDrillDown(e);
}).map(function(el) {

2
test/fixtures/bpmn/collapsed-sub-process.bpmn vendored
View File

@ -160,7 +160,7 @@
<sequenceFlow id="sid-3FAE72F2-4037-4CBA-8B89-01D7FC7FF3E3" sourceRef="parallelGateway_withoutContent" targetRef="sid-DA90DE99-58B0-4371-B71D-87A718ACB64D">
</sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="sid-cbeafa41-c891-415c-ab0d-3eb4a233f9ed">
<bpmndi:BPMNDiagram id="rootProcess_diagram">
<bpmndi:BPMNPlane id="sid-5fb4720f-4b99-4727-8770-dd4166bcd5e4" bpmnElement="rootProcess">
<bpmndi:BPMNEdge id="sid-3FAE72F2-4037-4CBA-8B89-01D7FC7FF3E3_gui" bpmnElement="sid-3FAE72F2-4037-4CBA-8B89-01D7FC7FF3E3">
<omgdi:waypoint x="675" y="215" />

18
test/spec/ModelerSpec.js
View File

@ -710,9 +710,8 @@ describe('Modeler', function() {
describe('drill down', function() {
function verifyDrilldown(xml) {
function verifyDrilldown() {
return createModeler(xml).then(function() {
var drilldown = container.querySelector('.bjs-drilldown');
var breadcrumbs = container.querySelector('.bjs-breadcrumbs');
var djsContainer = container.querySelector('.djs-container');
@ -727,21 +726,28 @@ describe('Modeler', function() {
// then
expect(djsContainer.classList.contains('bjs-breadcrumbs-shown')).to.be.true;
});
}
it('should allow drill down into collapsed sub-process', function() {
var xml = require('../fixtures/bpmn/collapsed-sub-process.bpmn');
return createModeler(xml).then(verifyDrilldown);
});
return verifyDrilldown(xml);
it('should allow drill down into collapsed sub-process after viewer.open', function() {
var xml = require('../fixtures/bpmn/collapsed-sub-process.bpmn');
return createModeler(xml)
.then(function() {
return modeler.open('rootProcess_diagram');
})
.then(verifyDrilldown);
});
it('should allow drill down into legacy collapsed sub-process', function() {
var xml = require('../fixtures/bpmn/collapsed-sub-process-legacy.bpmn');
return verifyDrilldown(xml);
return createModeler(xml).then(verifyDrilldown);
});