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:
Nico Rehwaldt 2020-03-02 14:20:02 +01:00
parent 98bc96caac bf84036729
commit 039f4a0273
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -6,6 +6,10 @@ All notable changes to [bpmn-js](https://github.com/bpmn-io/bpmn-js) are documen
___Note:__ Yet to be released changes appear here._ ___Note:__ Yet to be released changes appear here._
## 6.3.1
* `FIX`: prevent editor crash in some strict execution environments ([#1283](https://github.com/bpmn-io/bpmn-js/pull/1283))
## 6.3.0 ## 6.3.0
* `FEAT`: generate more generic IDs for new elements ([`035bb0c1`](https://github.com/bpmn-io/bpmn-js/commit/035bb0c1fd01adbaab8a340cb1075aa57736540d)) * `FEAT`: generate more generic IDs for new elements ([`035bb0c1`](https://github.com/bpmn-io/bpmn-js/commit/035bb0c1fd01adbaab8a340cb1075aa57736540d))

2
lib/features/copy-paste/ModdleCopy.js
View File

@ -164,7 +164,7 @@ ModdleCopy.prototype.copyElement = function(sourceElement, targetElement, proper
var copiedProperty = self.copyProperty(sourceProperty, targetElement, propertyName); var copiedProperty = self.copyProperty(sourceProperty, targetElement, propertyName);
var canSetProperty = self._eventBus.fire('moddleCopy.canSetCopiedProperty', { var canSetProperty = self._eventBus.fire('moddleCopy.canSetCopiedProperty', {
parent: parent, parent: targetElement,
property: copiedProperty, property: copiedProperty,
propertyName: propertyName propertyName: propertyName
}); });

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "bpmn-js", "name": "bpmn-js",
"version": "6.3.0", "version": "6.3.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "bpmn-js", "name": "bpmn-js",
"version": "6.3.0", "version": "6.3.1",
"description": "A bpmn 2.0 toolkit and web modeler", "description": "A bpmn 2.0 toolkit and web modeler",
"scripts": { "scripts": {
"all": "run-s lint test distro test:distro", "all": "run-s lint test distro test:distro",

12
test/spec/features/copy-paste/ModdleCopySpec.js
View File

@ -607,6 +607,12 @@ describe('features/copy-paste/ModdleCopy', function() {
}); });
eventBus.on('moddleCopy.canCopyProperty', HIGH_PRIORITY, function(context) { eventBus.on('moddleCopy.canCopyProperty', HIGH_PRIORITY, function(context) {
// verify provided properties
expect(context).to.have.property('parent');
expect(context).to.have.property('property');
expect(context).to.have.property('propertyName');
var propertyName = context.propertyName; var propertyName = context.propertyName;
if (propertyName === 'name') { if (propertyName === 'name') {
@ -630,6 +636,12 @@ describe('features/copy-paste/ModdleCopy', function() {
}); });
eventBus.on('moddleCopy.canSetCopiedProperty', HIGH_PRIORITY, function(context) { eventBus.on('moddleCopy.canSetCopiedProperty', HIGH_PRIORITY, function(context) {
// verify provided properties
expect(context).to.have.property('parent');
expect(context).to.have.property('property');
expect(context).to.have.property('propertyName');
var property = context.property; var property = context.property;
if (property === 'foo') { if (property === 'foo') {