Commit bed63c21 authored by jgould's avatar jgould

fix open file using drag and drop

parent 955197e2
...@@ -8,6 +8,8 @@ morpheus.OpenFileTool.prototype = { ...@@ -8,6 +8,8 @@ morpheus.OpenFileTool.prototype = {
gui : function() { gui : function() {
var array = [ { var array = [ {
name : 'open_file_action', name : 'open_file_action',
value : 'open',
type : 'bootstrap-select',
options : [ { options : [ {
name : 'Annotate columns', name : 'Annotate columns',
value : 'Annotate Columns' value : 'Annotate Columns'
...@@ -33,20 +35,21 @@ morpheus.OpenFileTool.prototype = { ...@@ -33,20 +35,21 @@ morpheus.OpenFileTool.prototype = {
}, { }, {
name : 'Open dendrogram', name : 'Open dendrogram',
value : 'Open dendrogram' value : 'Open dendrogram'
} ], } ]
value : 'open',
type : 'bootstrap-select'
}, {
name : 'file',
showLabel : false,
placeholder : 'Open your own file',
value : '',
type : 'file',
required : true,
help : morpheus.DatasetUtil.DATASET_FILE_FORMATS
} ]; } ];
if (this.options.file == null) {
array.push({
name : 'file',
showLabel : false,
placeholder : 'Open your own file',
value : '',
type : 'file',
required : true,
help : morpheus.DatasetUtil.DATASET_FILE_FORMATS
});
}
array.options = { array.options = {
ok : false, ok : this.options.file != null,
size : 'modal-lg' size : 'modal-lg'
}; };
return array; return array;
...@@ -68,24 +71,28 @@ morpheus.OpenFileTool.prototype = { ...@@ -68,24 +71,28 @@ morpheus.OpenFileTool.prototype = {
morpheus.DatasetUtil.ANNOTATION_FILE_FORMATS); morpheus.DatasetUtil.ANNOTATION_FILE_FORMATS);
} }
}); });
$('<h4>Use your own file</h4>').insertAfter( if (this.options.file == null) {
form.$form.find('.form-group:first')); $('<h4>Use your own file</h4>').insertAfter(
var _this = this; form.$form.find('.form-group:first'));
var id = _.uniqueId('morpheus'); var _this = this;
form.$form.append('<h4><a role="button" data-toggle="collapse" href="#' var id = _.uniqueId('morpheus');
+ id + '" aria-expanded="false" aria-controls="' + id form.$form
+ '">Or select a preloaded dataset</a></h4>'); .append('<h4><a role="button" data-toggle="collapse" href="#'
var $sampleDatasets = $('<div class="collapse" id="' + id + id
+ '" style="overflow:auto;"></div>'); + '" aria-expanded="false" aria-controls="'
form.$form.append($sampleDatasets); + id + '">Or select a preloaded dataset</a></h4>');
var sampleDatasets = new morpheus.SampleDatasets({ var $sampleDatasets = $('<div class="collapse" id="' + id
$el : $sampleDatasets, + '" style="overflow:auto;"></div>');
callback : function(heatMapOptions) { form.$form.append($sampleDatasets);
form.setValue('file', heatMapOptions.dataset); var sampleDatasets = new morpheus.SampleDatasets({
_this.ok(); $el : $sampleDatasets,
callback : function(heatMapOptions) {
form.setValue('file', heatMapOptions.dataset);
_this.ok();
} }
}); });
}
form.on('change', function(e) { form.on('change', function(e) {
var value = e.value; var value = e.value;
if (value !== '' && value != null) { if (value !== '' && value != null) {
......
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