bpmn-js 0.20.6 → 0.22.1

package/lib/features/ordering/BpmnOrderingProvider.js

@@ -1,147 +1,147 @@
-'use strict';
-
-var inherits = require('inherits');
-
-var OrderingProvider = require('diagram-js/lib/features/ordering/OrderingProvider');
-
-var isAny = require('../modeling/util/ModelingUtil').isAny;
-
-var findIndex = require('lodash/array/findIndex');
-
-var find = require('lodash/collection/find');
-
-
-/**
- * a simple ordering provider that makes sure:
- *
- * (1) elements are ordered by a {level} property
- * (2) elements with {alwaysOnTop} are always added to the root
- */
-function BpmnOrderingProvider(eventBus, translate) {
-
-  OrderingProvider.call(this, eventBus);
-
-  var orders = [
-    { type: 'bpmn:SubProcess', order: { level: 6 } },
-    {
-      type: 'bpmn:SequenceFlow',
-      order: {
-        level: 5,
-        containers: [
-          'bpmn:Participant',
-          'bpmn:FlowElementsContainer'
-        ]
-      }
-    },
-    // handle DataAssociation(s) like message flows and render them always on top
-    { type: 'bpmn:DataAssociation', order: { level: 9, containers: [ 'bpmn:Collaboration', 'bpmn:Process' ] } },
-    { type: 'bpmn:MessageFlow', order: { level: 9, containers: [ 'bpmn:Collaboration' ] } },
-    {
-      type: 'bpmn:Association',
-      order: {
-        level: 6,
-        containers: [
-          'bpmn:Participant',
-          'bpmn:FlowElementsContainer',
-          'bpmn:Collaboration'
-        ]
-      }
-    },
-    { type: 'bpmn:BoundaryEvent', order: { level: 8 } },
-    { type: 'bpmn:Participant', order: { level: -2 } },
-    { type: 'bpmn:Lane', order: { level: -1 } }
-  ];
-
-  function computeOrder(element) {
-    if (element.labelTarget) {
-      return { level: 10 };
-    }
-
-    var entry = find(orders, function(o) {
-      return isAny(element, [ o.type ]);
-    });
-
-    return entry && entry.order || { level: 1 };
-  }
-
-  function getOrder(element) {
-
-    var order = element.order;
-
-    if (!order) {
-      element.order = order = computeOrder(element);
-    }
-
-    return order;
-  }
-
-  function findActualParent(element, newParent, containers) {
-
-    var actualParent = newParent;
-
-    while (actualParent) {
-
-      if (isAny(actualParent, containers)) {
-        break;
-      }
-
-      actualParent = actualParent.parent;
-    }
-
-    if (!actualParent) {
-      throw new Error(translate('no parent for {element} in {parent}', {
-        element: element.id,
-        parent: newParent.id
-      }));
-    }
-
-    return actualParent;
-  }
-
-  this.getOrdering = function(element, newParent) {
-
-    var elementOrder = getOrder(element);
-
-
-    if (elementOrder.containers) {
-      newParent = findActualParent(element, newParent, elementOrder.containers);
-    }
-
-
-    var currentIndex = newParent.children.indexOf(element);
-
-    var insertIndex = findIndex(newParent.children, function(child) {
-
-      // do not compare with labels, they are created
-      // in the wrong order (right after elements) during import and
-      // mess up the positioning.
-      if (!element.labelTarget && child.labelTarget) {
-        return false;
-      }
-
-      return elementOrder.level < getOrder(child).level;
-    });
-
-
-    // if the element is already in the child list at
-    // a smaller index, we need to adjust the inser index.
-    // this takes into account that the element is being removed
-    // before being re-inserted
-    if (insertIndex !== -1) {
-      if (currentIndex !== -1 && currentIndex < insertIndex) {
-        insertIndex -= 1;
-      }
-    }
-
-    return {
-      index: insertIndex,
-      parent: newParent
-    };
-  };
-}
-
-BpmnOrderingProvider.$inject = [ 'eventBus', 'translate' ];
-
-inherits(BpmnOrderingProvider, OrderingProvider);
-
-module.exports = BpmnOrderingProvider;
+'use strict';
+
+var inherits = require('inherits');
+
+var OrderingProvider = require('diagram-js/lib/features/ordering/OrderingProvider');
+
+var isAny = require('../modeling/util/ModelingUtil').isAny;
+
+var findIndex = require('lodash/array/findIndex');
+
+var find = require('lodash/collection/find');
+
+
+/**
+ * a simple ordering provider that makes sure:
+ *
+ * (1) elements are ordered by a {level} property
+ * (2) elements with {alwaysOnTop} are always added to the root
+ */
+function BpmnOrderingProvider(eventBus, translate) {
+
+  OrderingProvider.call(this, eventBus);
+
+  var orders = [
+    { type: 'bpmn:SubProcess', order: { level: 6 } },
+    {
+      type: 'bpmn:SequenceFlow',
+      order: {
+        level: 5,
+        containers: [
+          'bpmn:Participant',
+          'bpmn:FlowElementsContainer'
+        ]
+      }
+    },
+    // handle DataAssociation(s) like message flows and render them always on top
+    { type: 'bpmn:DataAssociation', order: { level: 9, containers: [ 'bpmn:Collaboration', 'bpmn:Process' ] } },
+    { type: 'bpmn:MessageFlow', order: { level: 9, containers: [ 'bpmn:Collaboration' ] } },
+    {
+      type: 'bpmn:Association',
+      order: {
+        level: 6,
+        containers: [
+          'bpmn:Participant',
+          'bpmn:FlowElementsContainer',
+          'bpmn:Collaboration'
+        ]
+      }
+    },
+    { type: 'bpmn:BoundaryEvent', order: { level: 8 } },
+    { type: 'bpmn:Participant', order: { level: -2 } },
+    { type: 'bpmn:Lane', order: { level: -1 } }
+  ];
+
+  function computeOrder(element) {
+    if (element.labelTarget) {
+      return { level: 10 };
+    }
+
+    var entry = find(orders, function(o) {
+      return isAny(element, [ o.type ]);
+    });
+
+    return entry && entry.order || { level: 1 };
+  }
+
+  function getOrder(element) {
+
+    var order = element.order;
+
+    if (!order) {
+      element.order = order = computeOrder(element);
+    }
+
+    return order;
+  }
+
+  function findActualParent(element, newParent, containers) {
+
+    var actualParent = newParent;
+
+    while (actualParent) {
+
+      if (isAny(actualParent, containers)) {
+        break;
+      }
+
+      actualParent = actualParent.parent;
+    }
+
+    if (!actualParent) {
+      throw new Error(translate('no parent for {element} in {parent}', {
+        element: element.id,
+        parent: newParent.id
+      }));
+    }
+
+    return actualParent;
+  }
+
+  this.getOrdering = function(element, newParent) {
+
+    var elementOrder = getOrder(element);
+
+
+    if (elementOrder.containers) {
+      newParent = findActualParent(element, newParent, elementOrder.containers);
+    }
+
+
+    var currentIndex = newParent.children.indexOf(element);
+
+    var insertIndex = findIndex(newParent.children, function(child) {
+
+      // do not compare with labels, they are created
+      // in the wrong order (right after elements) during import and
+      // mess up the positioning.
+      if (!element.labelTarget && child.labelTarget) {
+        return false;
+      }
+
+      return elementOrder.level < getOrder(child).level;
+    });
+
+
+    // if the element is already in the child list at
+    // a smaller index, we need to adjust the inser index.
+    // this takes into account that the element is being removed
+    // before being re-inserted
+    if (insertIndex !== -1) {
+      if (currentIndex !== -1 && currentIndex < insertIndex) {
+        insertIndex -= 1;
+      }
+    }
+
+    return {
+      index: insertIndex,
+      parent: newParent
+    };
+  };
+}
+
+BpmnOrderingProvider.$inject = [ 'eventBus', 'translate' ];
+
+inherits(BpmnOrderingProvider, OrderingProvider);
+
+module.exports = BpmnOrderingProvider;

package/lib/features/ordering/index.js

@@ -1,7 +1,7 @@
-module.exports = {
-  __init__: [ 'bpmnOrderingProvider' ],
-  __depends__: [
-    require('diagram-js/lib/i18n/translate')
-  ],
-  bpmnOrderingProvider: [ 'type', require('./BpmnOrderingProvider') ]
+module.exports = {
+  __init__: [ 'bpmnOrderingProvider' ],
+  __depends__: [
+    require('diagram-js/lib/i18n/translate')
+  ],
+  bpmnOrderingProvider: [ 'type', require('./BpmnOrderingProvider') ]
 };

package/lib/features/palette/PaletteProvider.js

@@ -1,158 +1,158 @@
-'use strict';
-
-var assign = require('lodash/object/assign');
-
-/**
- * A palette provider for BPMN 2.0 elements.
- */
-function PaletteProvider(palette, create, elementFactory, spaceTool, lassoTool, handTool, globalConnect, translate) {
-
-  this._palette = palette;
-  this._create = create;
-  this._elementFactory = elementFactory;
-  this._spaceTool = spaceTool;
-  this._lassoTool = lassoTool;
-  this._handTool = handTool;
-  this._globalConnect = globalConnect;
-  this._translate = translate;
-
-  palette.registerProvider(this);
-}
-
-module.exports = PaletteProvider;
-
-PaletteProvider.$inject = [
-  'palette',
-  'create',
-  'elementFactory',
-  'spaceTool',
-  'lassoTool',
-  'handTool',
-  'globalConnect',
-  'translate'
-];
-
-
-PaletteProvider.prototype.getPaletteEntries = function(element) {
-
-  var actions  = {},
-      create = this._create,
-      elementFactory = this._elementFactory,
-      spaceTool = this._spaceTool,
-      lassoTool = this._lassoTool,
-      handTool = this._handTool,
-      globalConnect = this._globalConnect,
-      translate = this._translate;
-
-  function createAction(type, group, className, title, options) {
-
-    function createListener(event) {
-      var shape = elementFactory.createShape(assign({ type: type }, options));
-
-      if (options) {
-        shape.businessObject.di.isExpanded = options.isExpanded;
-      }
-
-      create.start(event, shape);
-    }
-
-    var shortType = type.replace(/^bpmn\:/, '');
-
-    return {
-      group: group,
-      className: className,
-      title: title || translate('Create {type}', { type: shortType }),
-      action: {
-        dragstart: createListener,
-        click: createListener
-      }
-    };
-  }
-
-  function createParticipant(event, collapsed) {
-    create.start(event, elementFactory.createParticipantShape(collapsed));
-  }
-
-  assign(actions, {
-    'hand-tool': {
-      group: 'tools',
-      className: 'bpmn-icon-hand-tool',
-      title: translate('Activate the hand tool'),
-      action: {
-        click: function(event) {
-          handTool.activateHand(event);
-        }
-      }
-    },
-    'lasso-tool': {
-      group: 'tools',
-      className: 'bpmn-icon-lasso-tool',
-      title: translate('Activate the lasso tool'),
-      action: {
-        click: function(event) {
-          lassoTool.activateSelection(event);
-        }
-      }
-    },
-    'space-tool': {
-      group: 'tools',
-      className: 'bpmn-icon-space-tool',
-      title: translate('Activate the create/remove space tool'),
-      action: {
-        click: function(event) {
-          spaceTool.activateSelection(event);
-        }
-      }
-    },
-    'global-connect-tool': {
-      group: 'tools',
-      className: 'bpmn-icon-connection-multi',
-      title: translate('Activate the global connect tool'),
-      action: {
-        click: function(event) {
-          globalConnect.toggle(event);
-        }
-      }
-    },
-    'tool-separator': {
-      group: 'tools',
-      separator: true
-    },
-    'create.start-event': createAction(
-      'bpmn:StartEvent', 'event', 'bpmn-icon-start-event-none'
-    ),
-    'create.intermediate-event': createAction('bpmn:IntermediateThrowEvent', 'event',
-      'bpmn-icon-intermediate-event-none', translate('Create IntermediateThrowEvent/BoundaryEvent')
-    ),
-    'create.end-event': createAction(
-      'bpmn:EndEvent', 'event', 'bpmn-icon-end-event-none'
-    ),
-    'create.exclusive-gateway': createAction(
-      'bpmn:ExclusiveGateway', 'gateway', 'bpmn-icon-gateway-xor'
-    ),
-    'create.task': createAction(
-      'bpmn:Task', 'activity', 'bpmn-icon-task'
-    ),
-    'create.data-object': createAction(
-      'bpmn:DataObjectReference', 'data-object', 'bpmn-icon-data-object'
-    ),
-    'create.data-store': createAction(
-      'bpmn:DataStoreReference', 'data-store', 'bpmn-icon-data-store'
-    ),
-    'create.subprocess-expanded': createAction(
-      'bpmn:SubProcess', 'activity', 'bpmn-icon-subprocess-expanded', translate('Create expanded SubProcess'),
-      { isExpanded: true }
-    ),
-    'create.participant-expanded': {
-      group: 'collaboration',
-      className: 'bpmn-icon-participant',
-      title: translate('Create Pool/Participant'),
-      action: {
-        dragstart: createParticipant,
-        click: createParticipant
-      }
-    }
-  });
-
-  return actions;
-};
+'use strict';
+
+var assign = require('lodash/object/assign');
+
+/**
+ * A palette provider for BPMN 2.0 elements.
+ */
+function PaletteProvider(palette, create, elementFactory, spaceTool, lassoTool, handTool, globalConnect, translate) {
+
+  this._palette = palette;
+  this._create = create;
+  this._elementFactory = elementFactory;
+  this._spaceTool = spaceTool;
+  this._lassoTool = lassoTool;
+  this._handTool = handTool;
+  this._globalConnect = globalConnect;
+  this._translate = translate;
+
+  palette.registerProvider(this);
+}
+
+module.exports = PaletteProvider;
+
+PaletteProvider.$inject = [
+  'palette',
+  'create',
+  'elementFactory',
+  'spaceTool',
+  'lassoTool',
+  'handTool',
+  'globalConnect',
+  'translate'
+];
+
+
+PaletteProvider.prototype.getPaletteEntries = function(element) {
+
+  var actions  = {},
+      create = this._create,
+      elementFactory = this._elementFactory,
+      spaceTool = this._spaceTool,
+      lassoTool = this._lassoTool,
+      handTool = this._handTool,
+      globalConnect = this._globalConnect,
+      translate = this._translate;
+
+  function createAction(type, group, className, title, options) {
+
+    function createListener(event) {
+      var shape = elementFactory.createShape(assign({ type: type }, options));
+
+      if (options) {
+        shape.businessObject.di.isExpanded = options.isExpanded;
+      }
+
+      create.start(event, shape);
+    }
+
+    var shortType = type.replace(/^bpmn\:/, '');
+
+    return {
+      group: group,
+      className: className,
+      title: title || translate('Create {type}', { type: shortType }),
+      action: {
+        dragstart: createListener,
+        click: createListener
+      }
+    };
+  }
+
+  function createParticipant(event, collapsed) {
+    create.start(event, elementFactory.createParticipantShape(collapsed));
+  }
+
+  assign(actions, {
+    'hand-tool': {
+      group: 'tools',
+      className: 'bpmn-icon-hand-tool',
+      title: translate('Activate the hand tool'),
+      action: {
+        click: function(event) {
+          handTool.activateHand(event);
+        }
+      }
+    },
+    'lasso-tool': {
+      group: 'tools',
+      className: 'bpmn-icon-lasso-tool',
+      title: translate('Activate the lasso tool'),
+      action: {
+        click: function(event) {
+          lassoTool.activateSelection(event);
+        }
+      }
+    },
+    'space-tool': {
+      group: 'tools',
+      className: 'bpmn-icon-space-tool',
+      title: translate('Activate the create/remove space tool'),
+      action: {
+        click: function(event) {
+          spaceTool.activateSelection(event);
+        }
+      }
+    },
+    'global-connect-tool': {
+      group: 'tools',
+      className: 'bpmn-icon-connection-multi',
+      title: translate('Activate the global connect tool'),
+      action: {
+        click: function(event) {
+          globalConnect.toggle(event);
+        }
+      }
+    },
+    'tool-separator': {
+      group: 'tools',
+      separator: true
+    },
+    'create.start-event': createAction(
+      'bpmn:StartEvent', 'event', 'bpmn-icon-start-event-none'
+    ),
+    'create.intermediate-event': createAction('bpmn:IntermediateThrowEvent', 'event',
+      'bpmn-icon-intermediate-event-none', translate('Create IntermediateThrowEvent/BoundaryEvent')
+    ),
+    'create.end-event': createAction(
+      'bpmn:EndEvent', 'event', 'bpmn-icon-end-event-none'
+    ),
+    'create.exclusive-gateway': createAction(
+      'bpmn:ExclusiveGateway', 'gateway', 'bpmn-icon-gateway-xor'
+    ),
+    'create.task': createAction(
+      'bpmn:Task', 'activity', 'bpmn-icon-task'
+    ),
+    'create.data-object': createAction(
+      'bpmn:DataObjectReference', 'data-object', 'bpmn-icon-data-object'
+    ),
+    'create.data-store': createAction(
+      'bpmn:DataStoreReference', 'data-store', 'bpmn-icon-data-store'
+    ),
+    'create.subprocess-expanded': createAction(
+      'bpmn:SubProcess', 'activity', 'bpmn-icon-subprocess-expanded', translate('Create expanded SubProcess'),
+      { isExpanded: true }
+    ),
+    'create.participant-expanded': {
+      group: 'collaboration',
+      className: 'bpmn-icon-participant',
+      title: translate('Create Pool/Participant'),
+      action: {
+        dragstart: createParticipant,
+        click: createParticipant
+      }
+    }
+  });
+
+  return actions;
+};

package/lib/features/palette/index.js

@@ -1,13 +1,13 @@
-module.exports = {
-  __depends__: [
-    require('diagram-js/lib/features/palette'),
-    require('diagram-js/lib/features/create'),
-    require('diagram-js/lib/features/space-tool'),
-    require('diagram-js/lib/features/lasso-tool'),
-    require('diagram-js/lib/features/hand-tool'),
-    require('diagram-js/lib/i18n/translate'),
-    require('../global-connect')
-  ],
-  __init__: [ 'paletteProvider' ],
-  paletteProvider: [ 'type', require('./PaletteProvider') ]
-};
+module.exports = {
+  __depends__: [
+    require('diagram-js/lib/features/palette'),
+    require('diagram-js/lib/features/create'),
+    require('diagram-js/lib/features/space-tool'),
+    require('diagram-js/lib/features/lasso-tool'),
+    require('diagram-js/lib/features/hand-tool'),
+    require('diagram-js/lib/i18n/translate'),
+    require('../global-connect')
+  ],
+  __init__: [ 'paletteProvider' ],
+  paletteProvider: [ 'type', require('./PaletteProvider') ]
+};