Skip to content

Commit

Permalink
Switching scatterplot to use agents instead of remotes, thus fixing #319
Browse files Browse the repository at this point in the history
  • Loading branch information
alexsielicki committed Jan 21, 2015
1 parent 5815d22 commit d68a256
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ $.widget("parameter_image.dendrogram",
session_cache : {},
image_cache : {},
cache_references : [ {}, {} ],
// session_cache and image_cache need to be shared between dendrogram and scatterplot, thus they passed inside an array to keep them in sync.
// session_cache and image_cache need to be shared between dendrogram and scatterplot, thus they are passed inside an array to keep them in sync.
// http://api.jqueryui.com/jquery.widget/
// All options passed on init are deep-copied to ensure the objects can be modified later without affecting the widget.
// Arrays are the only exception, they are referenced as-is.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1540,7 +1540,7 @@ define("slycat-parameter-image-scatterplot", ["d3"], function(d3)
console.log("Loading image " + image.uri + " from server");
var xhr = new XMLHttpRequest();
xhr.image = image;
xhr.open("GET", server_root + "remotes/" + self.options.session_cache[parser.hostname] + "/file" + parser.pathname, true);
xhr.open("GET", server_root + "agents/" + self.options.session_cache[parser.hostname] + "/file" + parser.pathname, true);
xhr.responseType = "arraybuffer";
xhr.onload = function(e)
{
Expand Down Expand Up @@ -1625,7 +1625,7 @@ define("slycat-parameter-image-scatterplot", ["d3"], function(d3)
{
async : true,
type : "POST",
url : server_root + "remotes",
url : server_root + "agents",
contentType : "application/json",
data : $.toJSON({"hostname":parser.hostname, "username":$("#remote-username", self.options.login_dialog).val(), "password":$("#remote-password", self.options.login_dialog).val()}),
processData : false,
Expand Down

0 comments on commit d68a256

Please sign in to comment.