Skip to content

GitLab

M
morpheus.js
Commit ad38210b authored by Joshua Gould's avatar Joshua Gould
Browse files
Options

urls updaetd

parent d3e878ef
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
js/morpheus-latest.min.js
View file @ ad38210b
This diff is collapsed.
src/sample_datasets.js
View file @ ad38210b
...@@ -88,7 +88,7 @@ morpheus.SampleDatasets = function(options) { ...@@ -88,7 +88,7 @@ morpheus.SampleDatasets = function(options) {
}); });
$ $
.ajax( .ajax(
'//s3.amazonaws.com/appdata.cmap.org/morpheus/tcga/tcga_index.txt') '//s3.amazonaws.com/data.clue.io/morpheus/tcga/tcga_index.txt')
.done( .done(
function(text) { function(text) {
var lines = text.split('\n'); var lines = text.split('\n');
...@@ -200,7 +200,7 @@ morpheus.SampleDatasets = function(options) { ...@@ -200,7 +200,7 @@ morpheus.SampleDatasets = function(options) {
}; };
morpheus.SampleDatasets.getTcgaDataset = function(options) { morpheus.SampleDatasets.getTcgaDataset = function(options) {
var baseUrl = '//s3.amazonaws.com/appdata.cmap.org/morpheus/tcga/' var baseUrl = '//s3.amazonaws.com/data.clue.io/morpheus/tcga/'
+ options.type + '/'; + options.type + '/';
var datasetOptions = {}; var datasetOptions = {};
if (options.mrna) { if (options.mrna) {
...@@ -240,35 +240,35 @@ morpheus.SampleDatasets.getCCLEDataset = function(options) { ...@@ -240,35 +240,35 @@ morpheus.SampleDatasets.getCCLEDataset = function(options) {
if (options.sig_genes) { if (options.sig_genes) {
datasets datasets
.push({ .push({
dataset : '//s3.amazonaws.com/appdata.cmap.org/morpheus/CCLE_hybrid_capture1650_hg19_NoCommonSNPs_NoNeutralVariants_CDS_2012.05.07.maf.txt' dataset : '//s3.amazonaws.com/data.clue.io/morpheus/CCLE_hybrid_capture1650_hg19_NoCommonSNPs_NoNeutralVariants_CDS_2012.05.07.maf.txt'
}); });
// datasets // datasets
// .push({ // .push({
// dataset : // dataset :
// '//s3.amazonaws.com/appdata.cmap.org/morpheus/1650_HC_plus_RD_muts.maf.txt' // '//s3.amazonaws.com/data.clue.io/morpheus/1650_HC_plus_RD_muts.maf.txt'
// }); // });
} }
if (options.cn) { if (options.cn) {
datasets datasets
.push({ .push({
dataset : '//s3.amazonaws.com/appdata.cmap.org/morpheus/CCLE_copynumber_byGene_2013-12-03.gct' dataset : '//s3.amazonaws.com/data.clue.io/morpheus/CCLE_copynumber_byGene_2013-12-03.gct'
}); });
} }
if (options.mrna) { if (options.mrna) {
datasets datasets
.push({ .push({
dataset : '//s3.amazonaws.com/appdata.cmap.org/morpheus/CCLE_Expression_Entrez_2012-09-29.txt' dataset : '//s3.amazonaws.com/data.clue.io/morpheus/CCLE_Expression_Entrez_2012-09-29.txt'
}); });
} }
if (options.ach) { if (options.ach) {
datasets datasets
.push({ .push({
dataset : '//s3.amazonaws.com/appdata.cmap.org/morpheus/Achilles_QC_v2.4.3.rnai.Gs.gct' dataset : '//s3.amazonaws.com/data.clue.io/morpheus/Achilles_QC_v2.4.3.rnai.Gs.gct'
}); });
} }
var columnAnnotations = [ { var columnAnnotations = [ {
file : '//s3.amazonaws.com/appdata.cmap.org/morpheus/CCLE_Sample_Info.txt', file : '//s3.amazonaws.com/data.clue.io/morpheus/CCLE_Sample_Info.txt',
datasetField : 'id', datasetField : 'id',
fileField : 'id' fileField : 'id'
} ]; } ];
...@@ -276,7 +276,7 @@ morpheus.SampleDatasets.getCCLEDataset = function(options) { ...@@ -276,7 +276,7 @@ morpheus.SampleDatasets.getCCLEDataset = function(options) {
// there are several cell lines that are in Achilles but not CCLE // there are several cell lines that are in Achilles but not CCLE
columnAnnotations columnAnnotations
.push({ .push({
file : '//s3.amazonaws.com/appdata.cmap.org/morpheus/Achilles_v2.4_SampleInfo_small.txt', file : '//s3.amazonaws.com/data.clue.io/morpheus/Achilles_v2.4_SampleInfo_small.txt',
datasetField : 'id', datasetField : 'id',
fileField : 'id' fileField : 'id'
}); });
......
src/ui/form_builder.js
View file @ ad38210b
...@@ -448,7 +448,7 @@ morpheus.FormBuilder.prototype = { ...@@ -448,7 +448,7 @@ morpheus.FormBuilder.prototype = {
// type = 'bootstrap-select'; // type = 'bootstrap-select';
// } // }
if (type == 'bootstrap-select') { if (type == 'bootstrap-select') {
html.push('<select data-selected-text-format="count" name="' html.push('<select data-live-search="' + (field.search ? true : false) + '" data-selected-text-format="count" name="'
+ name + '" id="' + id + name + '" id="' + id
+ '" class="selectpicker form-control"'); + '" class="selectpicker form-control"');
} else { } else {
......
src/util/util.js
View file @ ad38210b
...@@ -192,7 +192,7 @@ morpheus.Util.getFileName = function (fileOrUrl) { ...@@ -192,7 +192,7 @@ morpheus.Util.getFileName = function (fileOrUrl) {
name = '' + name; name = '' + name;
var slash = name.lastIndexOf('/'); var slash = name.lastIndexOf('/');
if (slash !== -1 && slash < name.length - 1) { if (slash !== -1 && slash < name.length - 1) {
// https://s3.amazonaws.com/appdata.cmap.org/icv/dosval/BRD-K45711268_10_UM_24_H/pcl_cell.gct?AWSAccessKeyId=AKIAJZQISWLUKFS3VUKA&Expires=1455761050&Signature=HVle9MvXV3OGRZHOngdm2frqER8%3D // https://s3.amazonaws.com/data.clue.io/icv/dosval/BRD-K45711268_10_UM_24_H/pcl_cell.gct?AWSAccessKeyId=AKIAJZQISWLUKFS3VUKA&Expires=1455761050&Signature=HVle9MvXV3OGRZHOngdm2frqER8%3D
name = name.substring(slash + 1); // get stuff after slash name = name.substring(slash + 1); // get stuff after slash
var question = name.indexOf('?'); var question = name.indexOf('?');
if (question !== -1 && name.length > (question + 1)) { if (question !== -1 && name.length > (question + 1)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment