diff --git a/app/index.html b/app/index.html index e3c7ca89..95f79649 100644 --- a/app/index.html +++ b/app/index.html @@ -121,6 +121,12 @@ +
+ +
+ +
+
diff --git a/app/js/app.js b/app/js/app.js index 839d6306..c60c0266 100755 --- a/app/js/app.js +++ b/app/js/app.js @@ -127,9 +127,12 @@ function setupLoader(callback) { $('.modal.js-import-dialog-file').modal('hide'); var $file = $form.find('input[type="file"]')[0]; var file = $file.files[0]; + var options = { + separator : $form.find('input[name="separator"]').val() + }; recline.Backend.loadFromCSVFile(file, function(dataset) { callback(dataset) - }); + }, options); }); } diff --git a/src/backend/localcsv.js b/src/backend/localcsv.js index fea29d0b..96126fe3 100644 --- a/src/backend/localcsv.js +++ b/src/backend/localcsv.js @@ -10,7 +10,7 @@ this.recline.Backend = this.recline.Backend || {}; var reader = new FileReader(); // TODO reader.onload = function(e) { - var dataset = my.csvToDataset(e.target.result); + var dataset = my.csvToDataset(e.target.result, options); callback(dataset); }; reader.onerror = function (e) { @@ -20,7 +20,7 @@ this.recline.Backend = this.recline.Backend || {}; }; my.csvToDataset = function(csvString, options) { - var out = my.parseCSV(csvString); + var out = my.parseCSV(csvString, options); fields = _.map(out[0], function(cell) { return { id: cell, label: cell }; }); @@ -91,7 +91,7 @@ this.recline.Backend = this.recline.Backend || {}; // If we are at a EOF or EOR if (inQuote === false && (cur === separator || cur === "\n")) { - field = processField(field); + field = processField(field); // Add the current field to the current row row.push(field); // If this is EOR append row to output and flush row