From 2c95cfcd4bfa00562be08bda5b943c1302af1821 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Sun, 14 Aug 2016 12:56:01 +0000
Subject: Check routing paths: notice use of this.url

---
 wqflask/wqflask/templates/marker_regression_gn1.html | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/wqflask/wqflask/templates/marker_regression_gn1.html b/wqflask/wqflask/templates/marker_regression_gn1.html
index 47e282cf..f5c4b4be 100644
--- a/wqflask/wqflask/templates/marker_regression_gn1.html
+++ b/wqflask/wqflask/templates/marker_regression_gn1.html
@@ -265,10 +265,15 @@
       /* This section checks for paths to JS libraries by
          checking the headers */
       list = [
+      /* check for static path */
       "/static/new/javascript/biodalliance.js",
-      "http://d3js.org/d3.v3.min.js",
       "/static/new/js_external/underscore-min.js",
-      "https://cdn.datatables.net/buttons/1.0.0/js/dataTables.buttons.min.js"
+      /* check for dalliance JS (see ./etc/default_settings.py) */
+      "/dalliance/build/dalliance-all.js",
+      /* D3 path (FIXME) */
+      "http://d3js.org/d3.v3.min.js",
+      /* datatables path (FIXME) */
+      "http://cdn.datatables.net/buttons/1.0.0/js/dataTables.buttons.min.js"
       ];
       for (var i = 0; i < list.length; i++) {
         url = list[i];
@@ -280,8 +285,8 @@
           },
           error: function() {
             // page does not exist
-            console.log("Failed to load "+url);
-            alert("Failed to load Javascript for "+url);
+            console.log("Failed to load "+this.url);
+            alert("Failed to load Javascript for "+this.url);
           }
       })};
     </script>
-- 
cgit v1.2.3