Merge branch 'master' into develop
This commit is contained in:
commit
039f4a0273
|
@ -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._
|
||||
|
||||
## 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
|
||||
|
||||
* `FEAT`: generate more generic IDs for new elements ([`035bb0c1`](https://github.com/bpmn-io/bpmn-js/commit/035bb0c1fd01adbaab8a340cb1075aa57736540d))
|
||||
|
|
|
@ -164,7 +164,7 @@ ModdleCopy.prototype.copyElement = function(sourceElement, targetElement, proper
|
|||
var copiedProperty = self.copyProperty(sourceProperty, targetElement, propertyName);
|
||||
|
||||
var canSetProperty = self._eventBus.fire('moddleCopy.canSetCopiedProperty', {
|
||||
parent: parent,
|
||||
parent: targetElement,
|
||||
property: copiedProperty,
|
||||
propertyName: propertyName
|
||||
});
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "bpmn-js",
|
||||
"version": "6.3.0",
|
||||
"version": "6.3.1",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "bpmn-js",
|
||||
"version": "6.3.0",
|
||||
"version": "6.3.1",
|
||||
"description": "A bpmn 2.0 toolkit and web modeler",
|
||||
"scripts": {
|
||||
"all": "run-s lint test distro test:distro",
|
||||
|
|
|
@ -607,6 +607,12 @@ describe('features/copy-paste/ModdleCopy', function() {
|
|||
});
|
||||
|
||||
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;
|
||||
|
||||
if (propertyName === 'name') {
|
||||
|
@ -630,6 +636,12 @@ describe('features/copy-paste/ModdleCopy', function() {
|
|||
});
|
||||
|
||||
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;
|
||||
|
||||
if (property === 'foo') {
|
||||
|
|
Loading…
Reference in New Issue