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

[#36,#39,demo/import][s]: import menu has working import from file (csv) (fixes #36, fixes #39).

Browse Source 
* First part of #39 (import menu) in 17986f25af.
This commit is contained in:
Rufus Pollock
2012-03-27 18:26:29 +01:00
parent f51b4b6d79
commit bae55355a5
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
demo/index.html
View File

@@ -36,6 +36,7 @@
<script type="text/javascript" src="../src/backend/dataproxy.js"></script> <script type="text/javascript" src="../src/backend/dataproxy.js"></script>
<script type="text/javascript" src="../src/backend/elasticsearch.js"></script> <script type="text/javascript" src="../src/backend/elasticsearch.js"></script>
<script type="text/javascript" src="../src/backend/gdocs.js"></script> <script type="text/javascript" src="../src/backend/gdocs.js"></script>
<script type="text/javascript" src="../src/backend/localcsv.js"></script>
<script type="text/javascript" src="../src/view.js"></script> <script type="text/javascript" src="../src/view.js"></script>
<script type="text/javascript" src="../src/view-grid.js"></script> <script type="text/javascript" src="../src/view-grid.js"></script>
<script type="text/javascript" src="../src/view-flot-graph.js"></script> <script type="text/javascript" src="../src/view-flot-graph.js"></script>
@@ -60,6 +61,9 @@
<li> <li>
<a data-toggle="modal" href=".js-import-dialog-url">Import from URL</a> <a data-toggle="modal" href=".js-import-dialog-url">Import from URL</a>
</li> </li>
<li>
<a data-toggle="modal" href=".js-import-dialog-file">Import from File</a>
</li>
</ul> </ul>
</li> </li>
<li><a class="set-read-only" title="Put into read-only mode">Read-only</a></li> <li><a class="set-read-only" title="Put into read-only mode">Read-only</a></li>
@@ -98,6 +102,26 @@
</div> </div>
</div> </div>
<div class="modal fade in js-import-dialog-file" style="display: none;">
<div class="modal-header">
<a class="close" data-dismiss="modal">×</a>
<h3>Import from File</h3>
</div>
<div class="modal-body">
<form class="form-horizontal">
<div class="control-group">
<label class="control-label">File</label>
<div class="controls">
<input type="file" name="source" />
</div>
</div>
<div class="form-actions">
<button type="submit" class="btn btn-primary">Import &raquo;</button>
</div>
</form>
</div>
</div>
<div class="container-fluid"> <div class="container-fluid">
<div class="content"> <div class="content">
<div class="data-explorer-here"></div> <div class="data-explorer-here"></div>

11
demo/js/app.js
View File

@@ -117,5 +117,16 @@ function setupLoader(callback) {
); );
callback(dataset); callback(dataset);
}); });
$('.js-import-dialog-file form').submit(function(e) {
e.preventDefault();
var $form = $(e.target);
$('.modal.js-import-dialog-file').modal('hide');
var $file = $form.find('input[type="file"]')[0];
var file = $file.files[0];
recline.Backend.loadFromCSVFile(file, function(dataset) {
callback(dataset)
});
});
} }