aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPjotr Prins2016-08-17 09:34:51 +0000
committerPjotr Prins2016-08-17 09:34:51 +0000
commitf5f4e2876349745eb055da289e1907fab9812ed2 (patch)
tree0675e255a8b9c5f6b99aee07ddc81fb963cb1a0b
parent7b75a31e01d986e8a78adf8defe3a68d39379e06 (diff)
parent2c95cfcd4bfa00562be08bda5b943c1302af1821 (diff)
downloadgenenetwork2-f5f4e2876349745eb055da289e1907fab9812ed2.tar.gz
Merge branch 'staging' into chfi
-rw-r--r--wqflask/wqflask/templates/marker_regression_gn1.html6
1 files changed, 5 insertions, 1 deletions
diff --git a/wqflask/wqflask/templates/marker_regression_gn1.html b/wqflask/wqflask/templates/marker_regression_gn1.html
index aba903c7..c06b77aa 100644
--- a/wqflask/wqflask/templates/marker_regression_gn1.html
+++ b/wqflask/wqflask/templates/marker_regression_gn1.html
@@ -265,10 +265,14 @@
/* This section checks for paths to JS libraries by
checking the headers */
list = [
+ /* check for static path */
"/static/new/javascript/biodalliance.js",
- "/dalliance/build/dalliance-all.js",
"/static/new/js_external/underscore-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) */
"https://cdn.datatables.net/buttons/1.0.0/js/dataTables.buttons.min.js"
];
for (var i = 0; i < list.length; i++) {