diff options
Diffstat (limited to 'wqflask')
| -rw-r--r-- | wqflask/wqflask/templates/marker_regression_gn1.html | 11 | ||||
| -rw-r--r-- | wqflask/wqflask/views.py | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/wqflask/wqflask/templates/marker_regression_gn1.html b/wqflask/wqflask/templates/marker_regression_gn1.html index a6c942dc..774c7a09 100644 --- a/wqflask/wqflask/templates/marker_regression_gn1.html +++ b/wqflask/wqflask/templates/marker_regression_gn1.html @@ -265,9 +265,14 @@ /* 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", + /* 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++) { @@ -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> diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py index 1f967dc9..14e019d2 100644 --- a/wqflask/wqflask/views.py +++ b/wqflask/wqflask/views.py @@ -110,7 +110,7 @@ def tmp_page(img_path): @app.route("/dalliance/<path:filename>") def bd_files(filename): - bd_path = app.config['BIODALLIANCE_PATH'] + bd_path = app.config['BIODALLIANCE_JS'] return send_from_directory(bd_path, filename) |