mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Use window.parent.options to get baseurl
Move worker-stats.js file to static so that plugin can find it Update compiled scatterplot.js with above changes
This commit is contained in:
@@ -821,7 +821,7 @@ var ScatterplotDisplay = Backbone.View.extend({
|
||||
var view = this,
|
||||
config = this.model.get("config"),
|
||||
//TODO: very tied to datasets - should be generalized eventually
|
||||
baseUrl = window.parent && window.parent.galaxy_config ? window.parent.galaxy_config.root : "/",
|
||||
baseUrl = window.parent && window.parent.options ? window.parent.options.root : "/",
|
||||
xhr = $.getJSON(baseUrl + "api/datasets/" + this.dataset.id, {
|
||||
data_type: "raw_data",
|
||||
provider: "dataset-column",
|
||||
@@ -986,7 +986,7 @@ var ScatterplotDisplay = Backbone.View.extend({
|
||||
}
|
||||
var view = this;
|
||||
var config = this.model.get("config");
|
||||
var meanWorker = new window.Worker("worker-stats.js");
|
||||
var meanWorker = new window.Worker("./static/worker-stats.js");
|
||||
meanWorker.postMessage({
|
||||
data: this.data,
|
||||
keys: [config.xColumn, config.yColumn]
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user