Skip to content

Commit

Permalink
revert demo to standard gwas and bump version to 0.4.8
Browse files Browse the repository at this point in the history
  • Loading branch information
Frencil committed Nov 9, 2016
1 parent 0d373b1 commit 15c1923
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion assets/js/app/LocusZoom.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* eslint-disable no-console */

var LocusZoom = {
version: "0.4.7"
version: "0.4.8"
};

// Populate a single element with a LocusZoom plot.
Expand Down
6 changes: 3 additions & 3 deletions demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h3>Top Hits</h3>
.add("recomb", ["RecombLZ", { url: apiBase + "annotation/recomb/results/", params: {source: 15} }])
.add("constraint", ["GeneConstraintLZ", { url: "http://exac.broadinstitute.org/api/constraint" }])
.add("sig", ["StaticJSON", [{ "x": 0, "y": 4.522 }, { "x": 2881033286, "y": 4.522 }] ])
.add("interval", ["IntervalLZ", { url: apiBase + "annotation/intervals/results/", params: {source: 16} }]);
//.add("interval", ["IntervalLZ", { url: apiBase + "annotation/intervals/results/", params: {source: 16} }]);
} else {
apiBase = window.location.origin + window.location.pathname.substr(0, window.location.pathname.length - "demo.html".length) + "staticdata/";
data_sources = new LocusZoom.DataSources()
Expand All @@ -58,10 +58,10 @@ <h3>Top Hits</h3>
.add("recomb", ["RecombLZ", { url: apiBase + "recomb_10_114550452-115067678.json?" }])
.add("constraint", ["GeneConstraintLZ", { url: apiBase + "constraint_10_114550452-115067678.json?" }])
.add("sig", ["StaticJSON", [{ "x": 0, "y": 7.30103 }, { "x": 2881033286, "y": 7.30103 }] ])
.add("interval", ["IntervalLZ", { url: apiBase + "intervals_10_114550452-115067678.json?" }]);
//.add("interval", ["IntervalLZ", { url: apiBase + "intervals_10_114550452-115067678.json?" }]);
}

layout = LocusZoom.Layouts.get("plot", "interval_association");
layout = LocusZoom.Layouts.get("plot", "standard_association");

// Populate the div with a LocusZoom plot using the default layout
var plot = LocusZoom.populate("#lz-1", data_sources, layout);
Expand Down
2 changes: 1 addition & 1 deletion locuszoom.app.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/* eslint-disable no-console */

var LocusZoom = {
version: "0.4.7"
version: "0.4.8"
};

// Populate a single element with a LocusZoom plot.
Expand Down

0 comments on commit 15c1923

Please sign in to comment.