knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#162,app,multiview][s]: minor refactoring to bring up to date with new model/backend setup.

Browse Source
This commit is contained in:
Rufus Pollock
2012-06-24 15:04:01 +01:00
parent d48115d274
commit f30c7d6273
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/js/app.js
View File

@@ -202,17 +202,17 @@ var ExplorerApp = Backbone.View.extend({
var $form = $(e.target); var $form = $(e.target);
$('.modal.js-load-dialog-file').modal('hide'); $('.modal.js-load-dialog-file').modal('hide');
var $file = $form.find('input[type="file"]')[0]; var $file = $form.find('input[type="file"]')[0];
var file = $file.files[0]; var dataset = new recline.Model.Dataset({
var options = { file: $file.files[0],
separator : $form.find('input[name="separator"]').val(), separator : $form.find('input[name="separator"]').val(),
delimiter : $form.find('input[name="delimiter"]').val(), delimiter : $form.find('input[name="delimiter"]').val(),
encoding : $form.find('input[name="encoding"]').val() encoding : $form.find('input[name="encoding"]').val()
};
recline.Backend.CSV.load(file, function(dataset) {
self.createExplorer(dataset)
}, },
options 'csv'
); );
dataset.fetch().done(function() {
self.createExplorer(dataset)
});
}, },
_getSettings: function() { _getSettings: function() {

5
src/view.multiview.js
View File

@@ -182,10 +182,9 @@ my.MultiView = Backbone.View.extend({
// retrieve basic data like fields etc // retrieve basic data like fields etc
// note this.model and dataset returned are the same // note this.model and dataset returned are the same
// TODO: set query state ...?
this.model.queryState.set(self.state.get('query'), {silent: true});
this.model.fetch() this.model.fetch()
.done(function(dataset) {
self.model.query(self.state.get('query'));
})
.fail(function(error) { .fail(function(error) {
self.notify({message: error.message, category: 'error', persist: true}); self.notify({message: error.message, category: 'error', persist: true});
}); });