update to work with latest upstream WebCola

- import latest git master
  tgdwyer/WebCola#203 (comment)

- use hacky workaround for d3 import
  tgdwyer/WebCola#145 (comment)

- update for new makeEdgeBetween API

Author: aspiers

html/git-deps.html

@@ -5,7 +5,6 @@
   <meta charset="utf-8" />
   <title>git commit dependency graph</title>
 
-  <script language="javascript" type="text/javascript" src="node_modules/webcola/WebCola/cola.min.js"></script>
   <script language="javascript" type="text/javascript" src="js/bundle.js"></script>
 
   <link rel="stylesheet" type="text/css" href="css/animate.css" />

html/js/git-deps-graph.coffee

@@ -4,6 +4,12 @@ d3 = require "d3"
 d3tip = require "d3-tip"
 d3tip d3
 
+# Hacky workaround:
+# https://github.com/tgdwyer/WebCola/issues/145#issuecomment-271316856
+window.d3 = d3
+
+cola = require "webcola"
+
 global.gdn = require "./git-deps-noty.coffee"
 global.gdd = require "./git-deps-data.coffee"
 global.gdl = require "./git-deps-layout.coffee"
@@ -548,17 +554,16 @@ tick_handler = ->
 
     paths.attr "d", (d) ->
         # Undocumented: https://github.com/tgdwyer/WebCola/issues/52
-        cola.vpsc.makeEdgeBetween \
-            d,
+        route = cola.makeEdgeBetween \
             d.source.innerBounds,
             d.target.innerBounds,
             # This value is related to but not equal to the
             # distance of arrow tip from object it points at:
             5
 
         lineData = [
-            {x: d.sourceIntersection.x, y: d.sourceIntersection.y},
-            {x: d.arrowStart.x, y: d.arrowStart.y}
+            {x: route.sourceIntersection.x, y: route.sourceIntersection.y},
+            {x: route.arrowStart.x, y: route.arrowStart.y}
         ]
         return lineFunction lineData
 

html/package.json

@@ -27,7 +27,7 @@
     "dependencies": {
         "d3-tip": "~0.6.6",
         "d3": "~3.5.3",
-        "webcola": "aspiers/WebCola#fix-commonjs",
+        "webcola": "aspiers/WebCola#git-deps-master",
         "jquery": "~2.1.3",
         "noty": "needim/noty",
         "browserify": "*",