Improve panning and zooming graph using svg-pan-zoom library

Author: Mark Robinson

src/main/resources/static/bower_components/graphviz-d3-renderer/.bower.json

@@ -1,11 +1,11 @@
 {
   "name": "graphviz-d3-renderer",
-  "version": "0.9.21",
+  "version": "0.9.24",
   "dependencies": {
     "requirejs": "2.1.15",
     "d3": "3.5.3",
     "requirejs-web-workers": "~1.0.1",
-    "viz.js": "~1.4.1"
+    "viz.js": "~1.5.1"
   },
   "devDependencies": {
     "rfactory": "1.1.0",
@@ -46,11 +46,11 @@
     "karma.conf.js"
   ],
   "homepage": "https://github.com/mstefaniuk/graph-viz-d3-js",
-  "_release": "0.9.21",
+  "_release": "0.9.24",
   "_resolution": {
     "type": "version",
-    "tag": "0.9.21",
-    "commit": "9cba7e58b832f59e51271f8f98367ab676ef206f"
+    "tag": "0.9.24",
+    "commit": "9588a63ee3d5ff651b00a6168340a8b7477b9845"
   },
   "_source": "https://github.com/mstefaniuk/graph-viz-d3-js.git",
   "_target": "^0.9.18",

src/main/resources/static/bower_components/graphviz-d3-renderer/bower.json

@@ -1,11 +1,11 @@
 {
   "name": "graphviz-d3-renderer",
-  "version": "0.9.18",
+  "version": "0.9.24",
   "dependencies": {
     "requirejs": "2.1.15",
     "d3": "3.5.3",
     "requirejs-web-workers": "~1.0.1",
-    "viz.js": "~1.4.1"
+    "viz.js": "~1.5.1"
   },
   "devDependencies": {
     "rfactory": "1.1.0",

src/main/resources/static/bower_components/graphviz-d3-renderer/dist/layout-worker.js

@@ -57,17 +57,17 @@ define('styliseur',["d3"], function(d3) {
   var styliseur = function () {
     this.each(function (d) {
       var self = d3.select(this);
-      var colorInsteadOfStroke = this instanceof SVGTextElement || false;
+      var fillInsteadOfStroke = this instanceof SVGTextElement || false;
       d && d.style && d.style.forEach(function (e) {
         switch (e.key) {
           case "stroke":
           case "fill":
-            var attribute = e.key==="stroke" && colorInsteadOfStroke ? "color" : e.key;
+            var attribute = e.key==="stroke" && fillInsteadOfStroke ? "fill" : e.key;
             var transparent = e.value.indexOf("#")===0 &&  e.value.length === 9;
             var color = transparent ? e.value.substr(0,7) : e.value;
             var opacity = transparent ? parseInt(e.value.substr(7,2),16)/255 : 1;
             self.attr(attribute, color);
-            opacity && self.attr(attribute + "-opacity", opacity);
+            opacity < 1 && self.attr(attribute + "-opacity", opacity);
             break;
           case "font-size":
           case "font-family":
@@ -313,7 +313,13 @@ define('stage',["d3", "palette", "transitions/default"], function (d3, palette,
           return d.id;
         });
 
-        transitions.nodes(entering.filter(".node"), function () {
+        entering
+          .filter(function(d) { return d.url; })
+          .append("a")
+          .attr("xlink:href", function(d) {return d.url;})
+          .attr("xlink:title", function(d) {return d.tooltip;});
+
+        transitions.nodes(entering.filter(".node:empty,.node a"), function () {
           this.style("opacity", 1.0);
         });
         transitions.relations(entering.filter(".relation"), function () {
@@ -327,7 +333,15 @@ define('stage',["d3", "palette", "transitions/default"], function (d3, palette,
           return order[a.class] - order[b.class];
         });
 
-        var shapes = groups.selectAll("path").data(function (d) {
+        var leaves = main
+          .selectAll("*")
+          .filter(function(d) {
+            return this instanceof SVGAElement ||
+              (this instanceof SVGGElement && !this.querySelector("a"));
+          });
+        var shapes = leaves
+          .selectAll("path")
+          .data(function (d) {
             return d.shapes;
           }, function (d, i) {
             return [d.shape, i].join('-');
@@ -342,9 +356,11 @@ define('stage',["d3", "palette", "transitions/default"], function (d3, palette,
             });
         });
 
-        var labels = groups.selectAll("text").data(function (d) {
-          return d.labels;
-        });
+        var labels = leaves
+          .selectAll("text")
+          .data(function (d) {
+            return d.labels;
+          });
         labels.enter().append("text");
         transitions.labels(labels, labelAttributer);
       },
@@ -354,8 +370,6 @@ define('stage',["d3", "palette", "transitions/default"], function (d3, palette,
         var scaleFactor = 1;
 
         var svgImage = new Image();
-        svgImage.src = "data:image/svg+xml;utf8," + svgXml;
-
         var pngImage = new Image();
 
         svgImage.onload = function () {
@@ -364,13 +378,16 @@ define('stage',["d3", "palette", "transitions/default"], function (d3, palette,
           canvas.height = svgImage.height * scaleFactor;
 
           var context = canvas.getContext("2d");
-          context.drawImage(svgImage, 0, 0, canvas.width, canvas.height);
+          context
+            .drawImage(
+              svgImage, 0, 0, canvas.width, canvas.height);
 
           pngImage.src = canvas.toDataURL("image/png");
           pngImage.width = svgImage.width;
           pngImage.height = svgImage.height;
         };
 
+        svgImage.src = "data:image/svg+xml;base64," + btoa(svgXml);
         return pngImage;
       }
     };

src/main/resources/static/bower_components/graphviz-d3-renderer/dist/renderer.js

@@ -1,6 +1,6 @@
 {
   "name": "graphviz-d3-renderer",
-  "version": "0.9.18",
+  "version": "0.9.24",
   "devDependencies": {
     "grunt": "~0.4.2",
     "grunt-bower-task": "~0.4.0",

src/main/resources/static/bower_components/graphviz-d3-renderer/package.json

@@ -0,0 +1,50 @@
+{
+  "name": "svg-pan-zoom",
+  "version": "3.4.1",
+  "homepage": "https://github.com/ariutta/svg-pan-zoom",
+  "authors": [
+    "Andrea Leofreddi <[email protected]>",
+    "Anders Riutta <[email protected]>",
+    "Zeng Xiaohui",
+    "Barry Coughlan (https://github.com/bcoughlan)",
+    "Risingson",
+    "bumbu alex (http://bumbu.me>)",
+    "Alexander Pico <[email protected]>",
+    "Kyran Burraston (http://kyranburraston.co.uk)",
+    "Risingson (https://github.com/Risingson)",
+    "Siddhanathan Shanmugam <[email protected]>",
+    "Karina Simard (https://github.com/ksimard)",
+    "Christopher Clark <[email protected]>",
+    "Vladimir Prus (http://vladimirprus.com)",
+    "Barry Coughlan (https://github.com/bcoughlan)",
+    "Ionică Bizău (http://ionicabizau.net/)",
+    "Ciprian Placintă (https://github.com/CiprianPlacinta)",
+    "Riccardo Santoro (https://github.com/VeNoMiS)",
+    "César Vidril (https://github.com/Yimiprod)"
+  ],
+  "description": "JavaScript library for panning and zooming an SVG image from the mouse, touches and programmatically.",
+  "main": "dist/svg-pan-zoom.js",
+  "keywords": [
+    "svg",
+    "pan",
+    "zoom"
+  ],
+  "license": "BSD",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "_release": "3.4.1",
+  "_resolution": {
+    "type": "version",
+    "tag": "3.4.1",
+    "commit": "ca0f1270402ca9f39a77e19217a58107204cf936"
+  },
+  "_source": "https://github.com/ariutta/svg-pan-zoom.git",
+  "_target": "^3.4.1",
+  "_originalSource": "svg-pan-zoom",
+  "_direct": true
+}

src/main/resources/static/bower_components/svg-pan-zoom/.bower.json

@@ -0,0 +1,42 @@
+Hi there!
+
+Thanks for submitting an issue to svg-pan-zoom.
+
+To help us help you better, please do the following before submitting an issue:
+
+1. Review the available [documentation](https://github.com/ariutta/svg-pan-zoom/blob/master/README.md) and existing [examples](https://github.com/ariutta/svg-pan-zoom#demos)
+1. Check if the same bug/feature request [wasn't previously reported](https://github.com/ariutta/svg-pan-zoom/issues?q=is%3Aissue%20)
+1. Make sure you are not asking a usage or debugging question. If you are, use [StackOverflow](http://stackoverflow.com/questions/tagged/svgpanzoom).
+1. Fill in the information that corresponds to your type of issue below
+1. If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem via https://jsfiddle.net or similar (template: http://jsfiddle.net/bumbu/167usffr/).
+1. Delete this intro and any unrelated text :smile: (if you do not we'll assume you haven't read these instructions and automatically close the issue)
+
+
+Bug report
+---
+
+### Expected behaviour
+_your text here_
+
+### Actual behaviour
+_your text here_
+
+### Steps to reproduce the behaviour
+
+1.
+2.
+
+### Configuration
+
+- svg-pan-zoom version: ``
+- Browser(s): ``
+- Operating system(s): ``
+- A relevant example URL: 
+
+
+Feature Request
+---
+
+- Feature description
+- Reasons for adopting new feature
+- Is this a breaking change? (How will this affect existing functionality)

src/main/resources/static/bower_components/svg-pan-zoom/ISSUE_TEMPLATE.md

@@ -0,0 +1,23 @@
+Copyright 2009-2010 Andrea Leofreddi <[email protected]>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.