diff --git a/src/main/resources/resources/bpmnjs/dist/index.js b/src/main/resources/resources/bpmnjs/dist/index.js
index 459bf0ac6cc5554a2c9f242fce58c822a1102fc9..8bd9a6a45c68c9d80e8d961f480c21f6201a56b6 100644
--- a/src/main/resources/resources/bpmnjs/dist/index.js
+++ b/src/main/resources/resources/bpmnjs/dist/index.js
@@ -15626,9 +15626,9 @@ ReplaceMenuProvider.prototype.getEntries = function (element) {
return [];
}
- var differentType = (0, _TypeUtil.isDifferentType)(element); // start events outside event sub processes
+ var differentType = (0, _TypeUtil.isDifferentType)(element); // start events outside sub processes
- if ((0, _ModelUtil.is)(businessObject, 'bpmn:StartEvent') && !(0, _DiUtil.isEventSubProcess)(businessObject.$parent)) {
+ if ((0, _ModelUtil.is)(businessObject, 'bpmn:StartEvent') && !(0, _ModelUtil.is)(businessObject.$parent, 'bpmn:SubProcess')) {
entries = (0, _minDash.filter)(replaceOptions.START_EVENT, differentType);
return this._createEntries(element, entries);
} // expanded/collapsed pools
@@ -15651,6 +15651,12 @@ ReplaceMenuProvider.prototype.getEntries = function (element) {
return differentType(entry) || !differentType(entry) && !isInterruptingEqual;
});
return this._createEntries(element, entries);
+ } // start events inside sub processes
+
+
+ if ((0, _ModelUtil.is)(businessObject, 'bpmn:StartEvent') && !(0, _DiUtil.isEventSubProcess)(businessObject.$parent) && (0, _ModelUtil.is)(businessObject.$parent, 'bpmn:SubProcess')) {
+ entries = (0, _minDash.filter)(replaceOptions.START_EVENT_SUB_PROCESS, differentType);
+ return this._createEntries(element, entries);
} // end events
@@ -16410,7 +16416,7 @@ function intersection(a1, a2) {
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PARTICIPANT = exports.SEQUENCE_FLOW = exports.EVENT_SUB_PROCESS_START_EVENT = exports.BOUNDARY_EVENT = exports.TASK = exports.EVENT_SUB_PROCESS = exports.TRANSACTION = exports.SUBPROCESS_EXPANDED = exports.GATEWAY = exports.END_EVENT = exports.INTERMEDIATE_EVENT = exports.START_EVENT = void 0;
+exports.PARTICIPANT = exports.SEQUENCE_FLOW = exports.EVENT_SUB_PROCESS_START_EVENT = exports.BOUNDARY_EVENT = exports.TASK = exports.EVENT_SUB_PROCESS = exports.TRANSACTION = exports.SUBPROCESS_EXPANDED = exports.GATEWAY = exports.END_EVENT = exports.INTERMEDIATE_EVENT = exports.START_EVENT_SUB_PROCESS = exports.START_EVENT = void 0;
var START_EVENT = [{
label: 'Start Event',
actionName: 'replace-with-none-start',
@@ -16466,6 +16472,29 @@ var START_EVENT = [{
}
}];
exports.START_EVENT = START_EVENT;
+var START_EVENT_SUB_PROCESS = [{
+ label: 'Start Event',
+ actionName: 'replace-with-none-start',
+ className: 'bpmn-icon-start-event-none',
+ target: {
+ type: 'bpmn:StartEvent'
+ }
+}, {
+ label: 'Intermediate Throw Event',
+ actionName: 'replace-with-none-intermediate-throwing',
+ className: 'bpmn-icon-intermediate-event-none',
+ target: {
+ type: 'bpmn:IntermediateThrowEvent'
+ }
+}, {
+ label: 'End Event',
+ actionName: 'replace-with-none-end',
+ className: 'bpmn-icon-end-event-none',
+ target: {
+ type: 'bpmn:EndEvent'
+ }
+}];
+exports.START_EVENT_SUB_PROCESS = START_EVENT_SUB_PROCESS;
var INTERMEDIATE_EVENT = [{
label: 'Start Event',
actionName: 'replace-with-none-start',
@@ -17328,11 +17357,11 @@ function isSameOrganization(a, b) {
}
function isMessageFlowSource(element) {
- return (0, _ModelUtil.is)(element, 'bpmn:InteractionNode') && (!(0, _ModelUtil.is)(element, 'bpmn:Event') || (0, _ModelUtil.is)(element, 'bpmn:ThrowEvent') && hasEventDefinitionOrNone(element, 'bpmn:MessageEventDefinition'));
+ return (0, _ModelUtil.is)(element, 'bpmn:InteractionNode') && !(0, _ModelUtil.is)(element, 'bpmn:BoundaryEvent') && (!(0, _ModelUtil.is)(element, 'bpmn:Event') || (0, _ModelUtil.is)(element, 'bpmn:ThrowEvent') && hasEventDefinitionOrNone(element, 'bpmn:MessageEventDefinition'));
}
function isMessageFlowTarget(element) {
- return (0, _ModelUtil.is)(element, 'bpmn:InteractionNode') && !isForCompensation(element) && (!(0, _ModelUtil.is)(element, 'bpmn:Event') || (0, _ModelUtil.is)(element, 'bpmn:CatchEvent') && hasEventDefinitionOrNone(element, 'bpmn:MessageEventDefinition'));
+ return (0, _ModelUtil.is)(element, 'bpmn:InteractionNode') && !(0, _ModelUtil.is)(element, 'bpmn:BoundaryEvent') && !isForCompensation(element) && (!(0, _ModelUtil.is)(element, 'bpmn:Event') || (0, _ModelUtil.is)(element, 'bpmn:CatchEvent') && hasEventDefinitionOrNone(element, 'bpmn:MessageEventDefinition'));
}
function getScopeParent(element) {
@@ -17653,6 +17682,15 @@ function canReplace(elements, target, position) {
oldElementId: element.id,
newElementType: 'bpmn:StartEvent'
});
+ } // replace a typed start event by a blank interrupting start event
+ // when the target is a sub process but not an event sub process
+
+
+ if (hasOneOfEventDefinitions(element, ['bpmn:MessageEventDefinition', 'bpmn:TimerEventDefinition', 'bpmn:SignalEventDefinition', 'bpmn:ConditionalEventDefinition']) && (0, _ModelUtil.is)(target, 'bpmn:SubProcess')) {
+ canExecute.replacements.push({
+ oldElementId: element.id,
+ newElementType: 'bpmn:StartEvent'
+ });
}
}
}
@@ -24825,7 +24863,7 @@ function createParallelDragger(parentGfx, segmentStart, segmentEnd, alignment) {
(0, _tinySvg.append)(parentGfx, draggerGfx);
var width = 14,
height = 3,
- padding = 6,
+ padding = 11,
hitWidth = calculateHitWidth(segmentStart, segmentEnd, alignment),
hitHeight = height + padding;
var visual = (0, _tinySvg.create)('rect');
@@ -64356,10 +64394,11 @@ function equalArrays(array, other, bitmask, customizer, equalFunc, stack) {
if (arrLength != othLength && !(isPartial && othLength > arrLength)) {
return false;
}
- // Assume cyclic values are equal.
- var stacked = stack.get(array);
- if (stacked && stack.get(other)) {
- return stacked == other;
+ // Check that cyclic values are equal.
+ var arrStacked = stack.get(array);
+ var othStacked = stack.get(other);
+ if (arrStacked && othStacked) {
+ return arrStacked == other && othStacked == array;
}
var index = -1,
result = true,
@@ -64567,10 +64606,11 @@ function equalObjects(object, other, bitmask, customizer, equalFunc, stack) {
return false;
}
}
- // Assume cyclic values are equal.
- var stacked = stack.get(object);
- if (stacked && stack.get(other)) {
- return stacked == other;
+ // Check that cyclic values are equal.
+ var objStacked = stack.get(object);
+ var othStacked = stack.get(other);
+ if (objStacked && othStacked) {
+ return objStacked == other && othStacked == object;
}
var result = true;
stack.set(object, other);
@@ -66816,6 +66856,10 @@ var arrayFilter = require('./_arrayFilter'),
* // The `_.property` iteratee shorthand.
* _.filter(users, 'active');
* // => objects for ['barney']
+ *
+ * // Combining several predicates using `_.overEvery` or `_.overSome`.
+ * _.filter(users, _.overSome([{ 'age': 36 }, ['age', 40]]));
+ * // => objects for ['fred', 'barney']
*/
function filter(collection, predicate) {
var func = isArray(collection) ? arrayFilter : baseFilter;
@@ -77266,7 +77310,7 @@ var _default = {
exports.default = _default;
},{}],574:[function(require,module,exports){
-module.exports = "\n\n \n \n \n \n \n \n \n \n \n \n";
+module.exports = "\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n";
},{}],575:[function(require,module,exports){
'use strict';
@@ -77337,8 +77381,259 @@ PropertiesActivator.prototype.isPropertyEditable = function(entry, propertyName,
return true;
};
},{}],576:[function(require,module,exports){
-arguments[4][4][0].apply(exports,arguments)
-},{"bpmn-js/lib/util/ModelUtil":141,"dup":4,"ids":346,"lodash/forEach":522,"min-dom":556}],577:[function(require,module,exports){
+'use strict';
+
+var domQuery = require('min-dom').query,
+ domClear = require('min-dom').clear,
+ is = require('bpmn-js/lib/util/ModelUtil').is,
+ forEach = require('lodash/forEach'),
+ domify = require('min-dom').domify,
+ Ids = require('ids').default;
+
+var SPACE_REGEX = /\s/;
+
+// for QName validation as per http://www.w3.org/TR/REC-xml/#NT-NameChar
+var QNAME_REGEX = /^([a-z][\w-.]*:)?[a-z_][\w-.]*$/i;
+
+// for ID validation as per BPMN Schema (QName - Namespace)
+var ID_REGEX = /^[a-z_][\w-.]*$/i;
+
+var PLACEHOLDER_REGEX = /\$\{([^}]*)\}/g;
+
+var HTML_ESCAPE_MAP = {
+ '&': '&',
+ '<': '<',
+ '>': '>',
+ '"': '"',
+ '\'': '''
+};
+
+function selectedOption(selectBox) {
+ if (selectBox.selectedIndex >= 0) {
+ return selectBox.options[selectBox.selectedIndex].value;
+ }
+}
+
+module.exports.selectedOption = selectedOption;
+
+
+function selectedType(elementSyntax, inputNode) {
+ var typeSelect = domQuery(elementSyntax, inputNode);
+ return selectedOption(typeSelect);
+}
+
+module.exports.selectedType = selectedType;
+
+
+/**
+ * Retrieve the root element the document this
+ * business object is contained in.
+ *
+ * @return {ModdleElement}
+ */
+function getRoot(businessObject) {
+ var parent = businessObject;
+ while (parent.$parent) {
+ parent = parent.$parent;
+ }
+ return parent;
+}
+
+module.exports.getRoot = getRoot;
+
+
+/**
+ * filters all elements in the list which have a given type.
+ * removes a new list
+ */
+function filterElementsByType(objectList, type) {
+ var list = objectList || [];
+ var result = [];
+ forEach(list, function(obj) {
+ if (is(obj, type)) {
+ result.push(obj);
+ }
+ });
+ return result;
+}
+
+module.exports.filterElementsByType = filterElementsByType;
+
+
+function findRootElementsByType(businessObject, referencedType) {
+ var root = getRoot(businessObject);
+
+ return filterElementsByType(root.rootElements, referencedType);
+}
+
+module.exports.findRootElementsByType = findRootElementsByType;
+
+
+function removeAllChildren(domElement) {
+ while (domElement.firstChild) {
+ domElement.removeChild(domElement.firstChild);
+ }
+}
+
+module.exports.removeAllChildren = removeAllChildren;
+
+
+/**
+ * adds an empty option to the list
+ */
+function addEmptyParameter(list) {
+ return list.push({ 'label': '', 'value': '', 'name': '' });
+}
+
+module.exports.addEmptyParameter = addEmptyParameter;
+
+
+/**
+ * returns a list with all root elements for the given parameter 'referencedType'
+ */
+function refreshOptionsModel(businessObject, referencedType) {
+ var model = [];
+ var referableObjects = findRootElementsByType(businessObject, referencedType);
+ forEach(referableObjects, function(obj) {
+ model.push({
+ label: (obj.name || '') + ' (id='+obj.id+')',
+ value: obj.id,
+ name: obj.name
+ });
+ });
+ return model;
+}
+
+module.exports.refreshOptionsModel = refreshOptionsModel;
+
+
+/**
+ * fills the drop down with options
+ */
+function updateOptionsDropDown(domSelector, businessObject, referencedType, entryNode) {
+ var options = refreshOptionsModel(businessObject, referencedType);
+ addEmptyParameter(options);
+ var selectBox = domQuery(domSelector, entryNode);
+ domClear(selectBox);
+
+ forEach(options, function(option) {
+ var optionEntry = domify('');
+ selectBox.appendChild(optionEntry);
+ });
+ return options;
+}
+
+module.exports.updateOptionsDropDown = updateOptionsDropDown;
+
+
+/**
+ * checks whether the id value is valid
+ *
+ * @param {ModdleElement} bo
+ * @param {String} idValue
+ * @param {Function} translate
+ *
+ * @return {String} error message
+ */
+function isIdValid(bo, idValue, translate) {
+ var assigned = bo.$model.ids.assigned(idValue);
+
+ var idExists = assigned && assigned !== bo;
+
+ if (!idValue || idExists) {
+ return translate('Element must have an unique id.');
+ }
+
+ return validateId(idValue, translate);
+}
+
+module.exports.isIdValid = isIdValid;
+
+
+function validateId(idValue, translate) {
+
+ idValue = stripPlaceholders(idValue);
+
+ if (containsSpace(idValue)) {
+ return translate('Id must not contain spaces.');
+ }
+
+ if (!ID_REGEX.test(idValue)) {
+
+ if (QNAME_REGEX.test(idValue)) {
+ return translate('Id must not contain prefix.');
+ }
+
+ return translate('Id must be a valid QName.');
+ }
+}
+
+module.exports.validateId = validateId;
+
+
+function containsSpace(value) {
+ return SPACE_REGEX.test(value);
+}
+
+module.exports.containsSpace = containsSpace;
+
+
+function stripPlaceholders(idValue) {
+
+ // replace expression e.g. ${VERSION_TAG}
+ // use only the content between ${}
+ // for the REGEX check
+ return idValue.replace(PLACEHOLDER_REGEX, '$1');
+}
+
+/**
+ * generate a semantic id with given prefix
+ */
+function nextId(prefix) {
+ var ids = new Ids([32,32,1]);
+
+ return ids.nextPrefixed(prefix);
+}
+
+module.exports.nextId = nextId;
+
+
+function triggerClickEvent(element) {
+ var evt;
+ var eventType = 'click';
+
+ if (document.createEvent) {
+ try {
+ // Chrome, Safari, Firefox
+ evt = new MouseEvent((eventType), { view: window, bubbles: true, cancelable: true });
+ } catch (e) {
+ // IE 11, PhantomJS (wat!)
+ evt = document.createEvent('MouseEvent');
+
+ evt.initEvent((eventType), true, true);
+ }
+ return element.dispatchEvent(evt);
+ } else {
+ // Welcome IE
+ evt = document.createEventObject();
+
+ return element.fireEvent('on' + eventType, evt);
+ }
+}
+
+module.exports.triggerClickEvent = triggerClickEvent;
+
+
+function escapeHTML(str) {
+ str = '' + str;
+
+ return str && str.replace(/[&<