bpmn-js - npm Package Compare versions

Comparing version 0.1.2 to 0.1.3

Gruntfile.js

@@ -78,5 +78,4 @@ module.exports = function(grunt) {
       options: {
-        transform: [ 'brfs' ],
         browserifyOptions: {
-          builtins: [ 'fs' ],
+          builtins: false,
           commondir: false
@@ -83,0 +82,0 @@ },

lib/draw/BpmnRenderer.js

@@ -56,4 +56,4 @@ var bpmnModule = require('../di').defaultModule;
               markerUnits: 'strokeWidth',
-              markerWidth: 10,
-              markerHeight: 6,
+              markerWidth: 11,
+              markerHeight: 11,
               orient: 'auto',
@@ -140,4 +140,4 @@ overflow: 'visible'
           markerUnits: 'strokeWidth',
-          markerWidth: 14.296,
-          markerHeight: 7.238,
+          markerWidth: 12,
+          markerHeight: 12,
           orient: 'auto',
@@ -161,4 +161,4 @@ overflow: 'visible',
           markerUnits: 'strokeWidth',
-          markerWidth: 14.296,
-          markerHeight: 7.238,
+          markerWidth: 14,
+          markerHeight: 13,
           orient: 'auto',
@@ -339,5 +339,3 @@ overflow: 'visible',
     'bpmn:Event': function(p, data) {
-      var circle = drawCircle(p, data.width, data.height);
-
-      return circle;
+      return drawCircle(p, data.width, data.height);
     },
@@ -644,5 +642,3 @@ 'bpmn:StartEvent': function(p, data) {
     'bpmn:Activity': function(p, data) {
-      var rect = drawRect(p, data.width, data.height, TASK_BORDER_RADIUS);
-
-      return rect;
+      return drawRect(p, data.width, data.height, TASK_BORDER_RADIUS);
     },
@@ -897,5 +893,3 @@
     'bpmn:AdHocSubProcess': function(p, data) {
-      var process = renderer('bpmn:SubProcess')(p, data);
-
-      return process;
+      return renderer('bpmn:SubProcess')(p, data);
     },
@@ -1107,3 +1101,4 @@ 'bpmn:Transaction': function(p, data) {
     'bpmn:SequenceFlow': function(p, data) {
-      var polyline = drawLine(p, data.waypoints);
+      var linePathData = createPathFromWaypoints(data.waypoints);
+      var flowPath = drawPath(p, linePathData);
 
@@ -1114,3 +1109,3 @@ var sequence = bpmnRegistry.getSemantic(data.id);
       if(!!sequence.conditionExpression) {
-        polyline.attr({
+        flowPath.attr({
           'marker-start': marker('conditional-flow-marker')
@@ -1131,3 +1126,3 @@ });
             source.default.id === data.id) {
-            polyline.attr({
+            flowPath.attr({
               'marker-start': marker('conditional-default-flow-marker')
@@ -1139,3 +1134,3 @@ });
 
-      return polyline.attr({
+      return flowPath.attr({
         'marker-end': marker('sequenceflow-end')
@@ -1142,0 +1137,0 @@ });

lib/draw/PathMap.js

@@ -209,3 +209,3 @@ /**
     'MARKER_SUB_PROCESS': {
-      d: 'm{mx} {my}, m 7,2 l 0,10 m -5,-5 l 10,0',
+      d: 'm{mx},{my} m 7,2 l 0,10 m -5,-5 l 10,0',
       height: 10,
@@ -217,3 +217,3 @@ width: 10,
     'MARKER_PARALLEL': {
-      d: 'm{mx} {my}, m 3,2 l 0,10 m 3,-10 l 0,10 m 3,-10 l 0,10',
+      d: 'm{mx},{my} m 3,2 l 0,10 m 3,-10 l 0,10 m 3,-10 l 0,10',
       height: 10,
@@ -225,3 +225,3 @@ width: 10,
     'MARKER_SEQUENTIAL': {
-      d: 'm{mx} {my}, m 0,3 l 10,0 m -10,3 l 10,0 m -10,3 l 10,0',
+      d: 'm{mx},{my} m 0,3 l 10,0 m -10,3 l 10,0 m -10,3 l 10,0',
       height: 10,
@@ -228,0 +228,0 @@ width: 10,

lib/import/BpmnTreeWalker.js

@@ -115,2 +115,6 @@ var _ = require('lodash');
 
+    if (!rootElement) {
+      throw new Error('no rootElement referenced in BPMNPlane <' + diagram.plane.id + '>');
+    }
+
     if (is(rootElement, 'bpmn:Process')) {
@@ -117,0 +121,0 @@ handleProcess(rootElement);

lib/Viewer.js

 var Diagram = require('diagram-js'),
     BpmnModel = require('bpmn-moddle'),
-    fs = require('fs'),
     $ = require('jquery'),
@@ -70,4 +69,10 @@ _ = require('lodash');
    */
-  var logoData = fs.readFileSync(__dirname + '/../resources/bpmnjs.png', 'base64');
 
+  /* jshint -W101 */
+
+  // inlined ../resources/bpmnjs.png
+  var logoData = 'iVBORw0KGgoAAAANSUhEUgAAADQAAAA0CAMAAADypuvZAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADBQTFRFiMte9PrwldFwfcZPqtqN0+zEyOe1XLgjvuKncsJAZ70y6fXh3vDT////UrQV////G2zN+AAAABB0Uk5T////////////////////AOAjXRkAAAHDSURBVHjavJZJkoUgDEBJmAX8979tM8u3E6x20VlYJfFFMoL4vBDxATxZcakIOJTWSmxvKWVIkJ8jHvlRv1F2LFrVISCZI+tCtQx+XfewgVTfyY3plPiQEAzI3zWy+kR6NBhFBYeBuscJLOUuA2WVLpCjVIaFzrNQZArxAZKUQm6gsj37L9Cb7dnIBUKxENaaMJQqMpDXvSL+ktxdGRm2IsKgJGGPg7atwUG5CcFUEuSv+CwQqizTrvDTNXdMU2bMiDWZd8d7QIySWVRsb2vBBioxOFt4OinPBapL+neAb5KL5IJ8szOza2/DYoipUCx+CjO0Bpsv0V6mktNZ+k8rlABlWG0FrOpKYVo8DT3dBeLEjUBAj7moDogVii7nSS9QzZnFcOVBp1g2PyBQ3Vr5aIapN91VJy33HTJLC1iX2FY6F8gRdaAeIEfVONgtFCzZTmoLEdOjBDfsIOA6128gw3eu1shAajdZNAORxuQDJN5A5PbEG6gNIu24QJD5iNyRMZIr6bsHbCtCU/OaOaSvgkUyDMdDa1BXGf5HJ1To+/Ym6mCKT02Y+/Sa126ZKyd3jxhzpc1r8zVL6YM1Qy/kR4ABAFJ6iQUnivhAAAAAAElFTkSuQmCC';
+
+  /* jshint +W101 */
+
   var a = $('<a href="http://bpmn.io" target="_blank" class="bjs-powered-by" title="Powered by bpmn.io" />').css({
@@ -74,0 +79,0 @@ position: 'absolute',

package.json

 {
   "name": "bpmn-js",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "A bpmn 2.0 toolkit and web modeler",
@@ -32,5 +32,2 @@ "scripts": {
   "license": "http://bpmn.io/license",
-  "browser": {
-    "fs": false
-  },
   "devDependencies": {
@@ -37,0 +34,0 @@ "grunt": "~0.4.4",

test/spec/browser/ViewerSpec.js

@@ -46,3 +46,3 @@ var fs = require('fs');
 
-    it('should handle errors', function(done) {
+    it('should handle non-bpmn input', function(done) {
 
@@ -61,2 +61,18 @@ var xml = 'invalid stuff';
 
+
+    it('should handle invalid BPMNPlane#bpmnElement', function(done) {
+
+      var xml = fs.readFileSync('test/fixtures/bpmn/error/di-plane-no-bpmn-element.bpmn', 'utf8');
+
+      var renderer = new Viewer(container);
+
+      renderer.importXML(xml, function(err) {
+
+        expect(err).toBeDefined();
+        expect(err.message).toEqual('no rootElement referenced in BPMNPlane <BPMNPlane_1>');
+
+        done();
+      });
+    });
+
   });
@@ -63,0 +79,0 @@

No alert changes

Improved metrics

Total package byte prevSize

810503

increased by0.15%

Lines of code

3478

increased by0.4%

Number of low supply chain risk alerts

7

decreased by-12.5%

No dependency changes