From 72f8c621944ba647fbe8551a0b0ff15727ab60e1 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Mon, 6 Jul 2015 15:03:51 +0100 Subject: [PATCH] updated galaxy mako Former-commit-id: 4dcd30eb3bc71c06aa51d67a142bfa4158c04b40 [formerly 76157631a0a8f25281dc24be3fb1f93333145cdd] Former-commit-id: 7e62b2ad9453ff2d95726ef3472e7e386ad6b303 --- galaxy.mako | 11 ++++------- package.json | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/galaxy.mako b/galaxy.mako index 18c0690b..4c8d8a6b 100644 --- a/galaxy.mako +++ b/galaxy.mako @@ -1,18 +1,15 @@ -var xhr = require("xhr"); var msa = require("msa"); -xhr(jsonURL, function(err, response,text){ - var data = JSON.parse(text).data; - - if(dataType == "galaxy.datatypes.sequence.Fasta"){ +galaxy.getData(function(data, req){ + + if(galaxy.dataType == "galaxy.datatypes.sequence.Fasta"){ var seqs = require("biojs-io-fasta").parse(data); }else{ - // it could be clustal var seqs = require("biojs-io-clustal").parse(data); } var m = new msa({ - el: galaxyDiv, + el: galaxy.el, seqs: seqs, zoomer: { labelWidth: 200 diff --git a/package.json b/package.json index 4bc43f06..e042a34a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "msa", "description": "Display multiple sequences", - "version": "0.4.2", + "version": "0.4.5", "homepage": "http://github.com/greenify/msa", "repository": { "type": "git",