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

Merge branch 'master' into develop

This commit is contained in:
Philipp Fromme 2019-09-27 14:33:32 +02:00
parent 0143595230 37bcd070e8
commit 5bed0aeca5
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/features/modeling/BpmnUpdater.js
View File

@ -19,6 +19,10 @@ import {
is is
} from '../../util/ModelUtil'; } from '../../util/ModelUtil';
import {
isAny
} from './util/ModelingUtil';
import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
/** /**
@ -230,10 +234,13 @@ export default function BpmnUpdater(
// on reconnectEnd -> default flow // on reconnectEnd -> default flow
if ((businessObject.sourceRef && businessObject.sourceRef.default) && if ((businessObject.sourceRef && businessObject.sourceRef.default) &&
!(is(newTarget, 'bpmn:Activity') || !isAny(newTarget, [
is(newTarget, 'bpmn:EndEvent') || 'bpmn:Activity',
is(newTarget, 'bpmn:Gateway') || 'bpmn:EndEvent',
is(newTarget, 'bpmn:IntermediateThrowEvent'))) { 'bpmn:Gateway',
'bpmn:IntermediateThrowEvent',
'bpmn:IntermediateCatchEvent'
])) {
context.default = businessObject.sourceRef.default; context.default = businessObject.sourceRef.default;
businessObject.sourceRef.default = undefined; businessObject.sourceRef.default = undefined;
} }
@ -248,10 +255,13 @@ export default function BpmnUpdater(
// on reconnectEnd -> conditional flow // on reconnectEnd -> conditional flow
if (oldTarget && (businessObject.conditionExpression) && if (oldTarget && (businessObject.conditionExpression) &&
!(is(newTarget, 'bpmn:Activity') || !isAny(newTarget, [
is(newTarget, 'bpmn:EndEvent') || 'bpmn:Activity',
is(newTarget, 'bpmn:Gateway') || 'bpmn:EndEvent',
is(newTarget, 'bpmn:IntermediateThrowEvent'))) { 'bpmn:Gateway',
'bpmn:IntermediateThrowEvent',
'bpmn:IntermediateCatchEvent'
])) {
context.conditionExpression = businessObject.conditionExpression; context.conditionExpression = businessObject.conditionExpression;
businessObject.conditionExpression = undefined; businessObject.conditionExpression = undefined;
} }

6
test/spec/features/popup-menu/ReplaceMenuProviderSpec.js
View File

@ -1459,7 +1459,8 @@ describe('features/popup-menu - replace menu provider', function() {
[ [
'bpmn:Activity', 'bpmn:Activity',
'bpmn:EndEvent', 'bpmn:EndEvent',
'bpmn:IntermediateThrowEvent' 'bpmn:IntermediateThrowEvent',
'bpmn:IntermediateCatchEvent'
].forEach(function(type) { ].forEach(function(type) {
it('should keep DefaultFlow when changing target to ' + type, it('should keep DefaultFlow when changing target to ' + type,
@ -1817,7 +1818,8 @@ describe('features/popup-menu - replace menu provider', function() {
[ [
'bpmn:Activity', 'bpmn:Activity',
'bpmn:EndEvent', 'bpmn:EndEvent',
'bpmn:IntermediateThrowEvent' 'bpmn:IntermediateThrowEvent',
'bpmn:IntermediateCatchEvent'
].forEach(function(type) { ].forEach(function(type) {
it('should keep ConditionalFlow when changing target to ' + type, it('should keep ConditionalFlow when changing target to ' + type,