From eec31e619800912880f67034da65e51a39a04697 Mon Sep 17 00:00:00 2001
From: Pitchaya Boonsarngsuk <2285135b@student.gla.ac.uk>
Date: Mon, 5 Feb 2018 11:30:18 +0000
Subject: [PATCH] Link fix distanceFunction global var leak

---
 examples/js/src/example-papaparsing/linkForce.js | 4 ++--
 src/link.js                                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/js/src/example-papaparsing/linkForce.js b/examples/js/src/example-papaparsing/linkForce.js
index 0143b49..be3835f 100644
--- a/examples/js/src/example-papaparsing/linkForce.js
+++ b/examples/js/src/example-papaparsing/linkForce.js
@@ -12,8 +12,8 @@ function startLinkSimulation() {
 
   if (tweakedVerOfLink) {
     force = d3.forceLinkFullyConnected()
-              .distance(function (n) {
-                return distanceFunction(n.source, n.target, props, norm);
+              .distance(function (n, m) {
+                return distanceFunction(n, m, props, norm);
               });
   }
   else {
diff --git a/src/link.js b/src/link.js
index 18b69d2..5c41dc7 100644
--- a/src/link.js
+++ b/src/link.js
@@ -47,7 +47,7 @@ export default function() {
     if (!nodes) return;
     for (let i = 1, n = nodes.length; i < n; i++) {
       for (let j = 0; j < i; j++) {
-        distances.push(distanceFunction(nodes[i], nodes[j], props, norm));
+        distances.push(distance(nodes[i], nodes[j]));
       }
     }
   }