bpmn-js 0.20.6 → 0.20.7

package/.travis.yml

@@ -1,6 +1,8 @@
 language: node_js
 node_js: '4.0'
 
+sudo: false
+
 addons:
   firefox: "latest-esr"
 

package/lib/features/copy-paste/BpmnCopyPaste.js

@@ -30,7 +30,9 @@ function removeProperties(element, properties) {
   });
 }
 
-function BpmnCopyPaste(bpmnFactory, eventBus, copyPaste, clipboard, moddle, canvas, bpmnRules) {
+function BpmnCopyPaste(
+    bpmnFactory, eventBus, copyPaste,
+    clipboard, canvas, bpmnRules) {
 
   var helper = new ModelCloneHelper(eventBus);
 
@@ -138,6 +140,14 @@ function BpmnCopyPaste(bpmnFactory, eventBus, copyPaste, clipboard, moddle, canv
       'triggeredByEvent'
     ]);
   });
+
+
+  eventBus.on('commandStack.elements.paste.postExecuted', function() {
+    // temporarily disable multi paste until #686
+    // is addressed
+    clipboard.clear();
+  });
+
 }
 
 
@@ -146,7 +156,6 @@ BpmnCopyPaste.$inject = [
   'eventBus',
   'copyPaste',
   'clipboard',
-  'moddle',
   'canvas',
   'bpmnRules'
 ];

package/lib/features/modeling/BpmnUpdater.js

@@ -74,19 +74,23 @@ function BpmnUpdater(eventBus, bpmnFactory, connectionDocking, translate) {
     self.updateParent(element, oldParent);
   }
 
-  this.executed([ 'shape.move',
-                  'shape.create',
-                  'shape.delete',
-                  'connection.create',
-                  'connection.move',
-                  'connection.delete' ], ifBpmn(updateParent));
-
-  this.reverted([ 'shape.move',
-                  'shape.create',
-                  'shape.delete',
-                  'connection.create',
-                  'connection.move',
-                  'connection.delete' ], ifBpmn(reverseUpdateParent));
+  this.executed([
+    'shape.move',
+    'shape.create',
+    'shape.delete',
+    'connection.create',
+    'connection.move',
+    'connection.delete'
+  ], ifBpmn(updateParent));
+
+  this.reverted([
+    'shape.move',
+    'shape.create',
+    'shape.delete',
+    'connection.create',
+    'connection.move',
+    'connection.delete'
+  ], ifBpmn(reverseUpdateParent));
 
   /*
    * ## Updating Parent

package/lib/features/modeling/behavior/ReplaceElementBehaviour.js

@@ -110,7 +110,9 @@ ReplaceElementBehaviour.prototype.replaceElements = function(elements, newElemen
   }
 };
 
-ReplaceElementBehaviour.$inject = [ 'eventBus', 'bpmnReplace', 'bpmnRules', 'elementRegistry',
- 'selection', 'modeling' ];
+ReplaceElementBehaviour.$inject = [
+  'eventBus', 'bpmnReplace', 'bpmnRules',
+  'elementRegistry', 'selection', 'modeling'
+];
 
 module.exports = ReplaceElementBehaviour;

package/lib/features/rules/BpmnRules.js

@@ -190,22 +190,6 @@ function isTextAnnotation(element) {
   return is(element, 'bpmn:TextAnnotation');
 }
 
-function isArtifact(element) {
-  return isAny(element, [
-    'bpmn:DataObjectReference',
-    'bpmn:DataStoreReference',
-    'bpmn:Group',
-    'bpmn:TextAnnotation'
-  ]);
-}
-
-function isDataObject(element) {
-  return isAny(element, [
-    'bpmn:DataObjectReference',
-    'bpmn:DataStoreReference'
-  ]);
-}
-
 function isCompensationBoundary(element) {
   return is(element, 'bpmn:BoundaryEvent') &&
          hasEventDefinition(element, 'bpmn:CompensateEventDefinition');
@@ -714,6 +698,22 @@ function canResize(shape, newBounds) {
   return false;
 }
 
+/**
+ * Check, whether one side of the relationship
+ * is a text annotation.
+ */
+function isOneTextAnnotation(source, target) {
+
+  var sourceTextAnnotation = isTextAnnotation(source),
+      targetTextAnnotation = isTextAnnotation(target);
+
+  return (
+    (sourceTextAnnotation || targetTextAnnotation) &&
+    (sourceTextAnnotation !== targetTextAnnotation)
+  );
+}
+
+
 function canConnectAssociation(source, target) {
 
   // do not connect connections
@@ -726,12 +726,13 @@ function canConnectAssociation(source, target) {
     return true;
   }
 
-  // only connect artifacts with other BPMN (graphical) elements
-  // connect if different parent
-  return ((isArtifact(source) && !isDataObject(source) && !isArtifact(target)) ||
-          (!isArtifact(source) && isArtifact(target) && !isDataObject(target))) &&
-         !isParent(target, source) &&
-         !isParent(source, target);
+  // don't connect parent <-> child
+  if (isParent(target, source) || isParent(source, target)) {
+    return false;
+  }
+
+  // allow connection of associations between <!TextAnnotation> and <TextAnnotation>
+  return isOneTextAnnotation(source, target);
 }
 
 function canConnectMessageFlow(source, target) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "0.20.6",
+  "version": "0.20.7",
   "description": "A bpmn 2.0 toolkit and web modeler",
   "scripts": {
     "all": "grunt",
@@ -37,34 +37,34 @@
     "browserify": "^13.0.0",
     "browserify-derequire": "^0.9.1",
     "bundle-collapser": "^1.1.1",
-    "chai": "~2.2.0",
-    "eslint": "^2.11.1",
-    "eslint-plugin-mocha": "^2.2.0",
+    "chai": "^3.5.0",
+    "eslint": "^3.19.0",
+    "eslint-plugin-mocha": "^4.9.0",
     "grunt": "^0.4.4",
     "grunt-cli": "^0.1.13",
     "grunt-contrib-copy": "^0.7.0",
-    "grunt-eslint": "^18.1.0",
-    "grunt-karma": "^0.12.0",
+    "grunt-eslint": "^19.0.0",
+    "grunt-karma": "^2.0.0",
     "grunt-release": "^0.7.0",
     "jsondiffpatch": "^0.1.26",
-    "karma": "^0.13.0",
-    "karma-browserify": "^5.0.1",
+    "karma": "^1.7.0",
+    "karma-browserify": "^5.1.1",
     "karma-chai": "^0.1.0",
-    "karma-chrome-launcher": "^0.2.2",
+    "karma-chrome-launcher": "^2.1.1",
     "karma-env-preprocessor": "^0.1.1",
-    "karma-firefox-launcher": "^0.1.3",
-    "karma-ie-launcher": "^0.2.0",
-    "karma-mocha": "~0.1.0",
-    "karma-phantomjs-launcher": "^1.0.2",
-    "karma-safari-launcher": "^0.1.1",
-    "karma-sinon-chai": "~0.3.0",
-    "karma-spec-reporter": "0.0.26",
+    "karma-firefox-launcher": "^1.0.1",
+    "karma-ie-launcher": "^1.0.0",
+    "karma-mocha": "^1.3.0",
+    "karma-phantomjs-launcher": "^1.0.4",
+    "karma-safari-launcher": "^1.0.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-spec-reporter": "0.0.31",
     "load-grunt-tasks": "^0.3.0",
-    "mocha": "^2.2.5",
+    "mocha": "^3.4.1",
     "mocha-test-container-support": "0.2.0",
     "phantomjs-prebuilt": "^2.1.12",
-    "sinon": "~1.14.1",
-    "sinon-chai": "~2.7.0",
+    "sinon": "^2.2.0",
+    "sinon-chai": "^2.10.0",
     "source-map-concat": "^1.0.0",
     "stringify": "^3.1.0",
     "time-grunt": "^0.3.2",
@@ -73,7 +73,7 @@
   },
   "dependencies": {
     "bpmn-moddle": "^0.14.0",
-    "diagram-js": "^0.19.4",
+    "diagram-js": "^0.19.6",
     "diagram-js-direct-editing": "^0.17.1",
     "diagram-js-origin": "^0.15.1",
     "ids": "^0.2.0",

package/test/spec/features/copy-paste/BpmnCopyPasteSpec.js

@@ -58,6 +58,38 @@ describe('features/copy-paste', function() {
     });
 
 
+    it('should forbid multi paste', inject(
+      function(elementRegistry, canvas, copyPaste) {
+        // given
+        var element = elementRegistry.get('SubProcess_1kd6ist'),
+            rootElement = canvas.getRootElement();
+
+        // when
+        copyPaste.copy(element);
+
+        copyPaste.paste({
+          element: rootElement,
+          point: {
+            x: 600,
+            y: 100
+          }
+        });
+
+        copyPaste.paste({
+          element: rootElement,
+          point: {
+            x: 600,
+            y: 275
+          }
+        });
+
+        // then
+        // pasted was only once
+        expect(rootElement.children).to.have.length(2);
+      }
+    ));
+
+
     describe('integration', function() {
 
       it('should retain label\'s relative position',
@@ -489,6 +521,7 @@ describe('features/copy-paste', function() {
       it('multiple participants', inject(integrationTest([ 'Participant_0pgdgt4', 'Participant_1id96b4' ])));
 
       it('multiple participants', inject(integrationTest([ 'Participant_0pgdgt4', 'Participant_1id96b4' ])));
+
     });
 
   });

package/test/spec/features/rules/BpmnRulesSpec.js

@@ -207,6 +207,50 @@ describe('features/modeling/rules - BpmnRules', function() {
     }));
 
 
+    it('connect DataObjectReference -> TextAnnotation', inject(function() {
+
+      expectCanConnect('DataObjectReference', 'TextAnnotation', {
+        sequenceFlow: false,
+        messageFlow: false,
+        association: true,
+        dataAssociation: false
+      });
+    }));
+
+
+    it('connect TextAnnotation -> DataObjectReference', inject(function() {
+
+      expectCanConnect('TextAnnotation', 'DataObjectReference', {
+        sequenceFlow: false,
+        messageFlow: false,
+        association: true,
+        dataAssociation: false
+      });
+    }));
+
+
+    it('connect DataStoreReference -> TextAnnotation', inject(function() {
+
+      expectCanConnect('DataStoreReference', 'TextAnnotation', {
+        sequenceFlow: false,
+        messageFlow: false,
+        association: true,
+        dataAssociation: false
+      });
+    }));
+
+
+    it('connect TextAnnotation -> DataStoreReference', inject(function() {
+
+      expectCanConnect('TextAnnotation', 'DataStoreReference', {
+        sequenceFlow: false,
+        messageFlow: false,
+        association: true,
+        dataAssociation: false
+      });
+    }));
+
+
     it('connect StartEvent_None -> DataStoreReference', inject(function() {
 
       expectCanConnect('StartEvent_None', 'DataStoreReference', {