Skip to content
This repository has been archived by the owner on Mar 13, 2019. It is now read-only.

Commit

Permalink
Add text description to import panel
Browse files Browse the repository at this point in the history
  • Loading branch information
josecolella committed Jun 30, 2014
1 parent d90e56b commit 0a9a803
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions visualization/static/visualization/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ var manageImportOpen = function() {

} else {
dropzone.fadeIn("slow");
dropzone.prepend("<div class='alert alert-info fade in' id='import-info'><button type='button' class='close data-dismiss='alert' aria-hidden='true'>×</button><strong>Drop</strong> or <strong>Click</strong> on the panel below to import your data sets <b>(Accepted Files: <em>excel [xlsx, xls]</em>, <em>json</em>, <em>csv</em>, <em>txt</em>)</b></div>");
dropzone.prepend("<div class='alert alert-info fade in' id='import-info'><button type='button' class='close data-dismiss='alert' aria-hidden='true'>×</button><strong>Drop</strong> or <strong>Click</strong> on the panel below to import your data sets <b>(Accepted Files: <em>excel [xlsx, xls]</em>, <em>json</em>, <em>csv</em>, <em>xml</em>, <em>txt</em>)</b></div>");

}

Expand Down Expand Up @@ -324,7 +324,7 @@ var addDataGrid = function(data) {
return $('<button></button>').addClass('changeType').html('\u25BC');
};

if (dataTableDiv.length == 0) {
if (dataTable.length == 0) {
workspace.append('<div id="dataTable" style="overflow: scroll"></div>');
$("#dataTable").handsontable({
minRows: 20,
Expand Down Expand Up @@ -357,10 +357,10 @@ var addDataGrid = function(data) {
});


} else if(dataTableDiv.is(":visible")){
dataTableDiv.fadeOut();
} else if(dataTable.is(":visible")){
dataTable.fadeOut();
} else {
dataTableDiv.fadeIn();
dataTable.fadeIn();
}


Expand Down Expand Up @@ -727,6 +727,7 @@ $(function() {
processJSONFileContents(url);
break;
case 'csv':
case 'txt':
console.log('Its a CSV file');
processCSVFileContents(url);
break;
Expand Down

0 comments on commit 0a9a803

Please sign in to comment.