diff options
| author | Pjotr Prins | 2016-08-19 08:06:21 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2016-08-19 08:06:21 +0000 |
| commit | 828287669ded48da7712bfbaf320d5f4a8abe163 (patch) | |
| tree | 1eb953f78fbcf810bd5bc4cf8cdaf1ae4c8dde39 | |
| parent | f5f4e2876349745eb055da289e1907fab9812ed2 (diff) | |
| parent | abb988fca2c0c67be0bcd7108902fb3ba403d5b9 (diff) | |
| download | genenetwork2-828287669ded48da7712bfbaf320d5f4a8abe163.tar.gz | |
Merge branch 'biodalliance' of github.com:chfi/genenetwork2 into chfi
3 files changed, 16 insertions, 1 deletions
diff --git a/wqflask/wqflask/static/new/javascript/chr_lod_chart.coffee b/wqflask/wqflask/static/new/javascript/chr_lod_chart.coffee index 7fec4836..8a5a3569 100644 --- a/wqflask/wqflask/static/new/javascript/chr_lod_chart.coffee +++ b/wqflask/wqflask/static/new/javascript/chr_lod_chart.coffee @@ -274,6 +274,7 @@ class Chr_Lod_Chart $('#topchart').remove()
$('#chart_container').append('<div class="qtlcharts" id="topchart"></div>')
BD.hideButton()
+ $('#close_bd').hide();
$('#bd_container').hide()
create_lod_chart()
diff --git a/wqflask/wqflask/static/new/javascript/chr_lod_chart.js b/wqflask/wqflask/static/new/javascript/chr_lod_chart.js index 6603b534..bae4565d 100644 --- a/wqflask/wqflask/static/new/javascript/chr_lod_chart.js +++ b/wqflask/wqflask/static/new/javascript/chr_lod_chart.js @@ -259,6 +259,7 @@ Chr_Lod_Chart = (function() { $('#topchart').remove(); $('#chart_container').append('<div class="qtlcharts" id="topchart"></div>'); BD.hideButton(); + $('#close_bd').hide(); $('#bd_container').hide(); return create_lod_chart(); }; diff --git a/wqflask/wqflask/templates/marker_regression_gn1.html b/wqflask/wqflask/templates/marker_regression_gn1.html index c06b77aa..774c7a09 100644 --- a/wqflask/wqflask/templates/marker_regression_gn1.html +++ b/wqflask/wqflask/templates/marker_regression_gn1.html @@ -441,7 +441,20 @@ BD.putSource({name: 'SNP density', jbURI: "http://test-gn2.genenetwork.org/api_pre1/snp", jbQuery: "", - stylesheet_uri: "http://test-gn2.genenetwork.org/api_pre1/stylesheets/snp-stylesheet.xml", + style: [{ + type: 'default', + style: { + glyph: "HISTOGRAM", + MIN: 0, + MAX: 5000, + HEIGHT: 60, + STEPS: 100, + COLOR1: "red", + COLOR2: "red", + COLOR3: "red", + AXISCENTER: "true", + } + }] }); </script> |