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,10 +35,10 @@ morpheus.OpenFileTool.prototype = { ...@@ -33,10 +35,10 @@ morpheus.OpenFileTool.prototype = {
}, { }, {
name : 'Open dendrogram', name : 'Open dendrogram',
value : 'Open dendrogram' value : 'Open dendrogram'
} ], } ]
value : 'open', } ];
type : 'bootstrap-select' if (this.options.file == null) {
}, { array.push({
name : 'file', name : 'file',
showLabel : false, showLabel : false,
placeholder : 'Open your own file', placeholder : 'Open your own file',
...@@ -44,9 +46,10 @@ morpheus.OpenFileTool.prototype = { ...@@ -44,9 +46,10 @@ morpheus.OpenFileTool.prototype = {
type : 'file', type : 'file',
required : true, required : true,
help : morpheus.DatasetUtil.DATASET_FILE_FORMATS 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,13 +71,16 @@ morpheus.OpenFileTool.prototype = { ...@@ -68,13 +71,16 @@ morpheus.OpenFileTool.prototype = {
morpheus.DatasetUtil.ANNOTATION_FILE_FORMATS); morpheus.DatasetUtil.ANNOTATION_FILE_FORMATS);
} }
}); });
if (this.options.file == null) {
$('<h4>Use your own file</h4>').insertAfter( $('<h4>Use your own file</h4>').insertAfter(
form.$form.find('.form-group:first')); form.$form.find('.form-group:first'));
var _this = this; var _this = this;
var id = _.uniqueId('morpheus'); var id = _.uniqueId('morpheus');
form.$form.append('<h4><a role="button" data-toggle="collapse" href="#' form.$form
+ id + '" aria-expanded="false" aria-controls="' + id .append('<h4><a role="button" data-toggle="collapse" href="#'
+ '">Or select a preloaded dataset</a></h4>'); + id
+ '" aria-expanded="false" aria-controls="'
+ id + '">Or select a preloaded dataset</a></h4>');
var $sampleDatasets = $('<div class="collapse" id="' + id var $sampleDatasets = $('<div class="collapse" id="' + id
+ '" style="overflow:auto;"></div>'); + '" style="overflow:auto;"></div>');
form.$form.append($sampleDatasets); form.$form.append($sampleDatasets);
...@@ -86,6 +92,7 @@ morpheus.OpenFileTool.prototype = { ...@@ -86,6 +92,7 @@ morpheus.OpenFileTool.prototype = {
} }
}); });
}
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