aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js
diff options
context:
space:
mode:
authorClemens <cle1000.cb@gmail.com>2016-06-01 23:12:49 +0200
committerMaximilian Hils <git@maximilianhils.com>2016-06-02 10:30:53 -0700
commita219d3343081e13a005fc37e30a0bab83a773099 (patch)
tree639c900b5831cf7b496aa9ad84a36e9bcfcbbfd4 /web/src/js
parentcf544318ae7b59711f64166fe765c93ec8fb42c1 (diff)
downloadmitmproxy-a219d3343081e13a005fc37e30a0bab83a773099.tar.gz
mitmproxy-a219d3343081e13a005fc37e30a0bab83a773099.tar.bz2
mitmproxy-a219d3343081e13a005fc37e30a0bab83a773099.zip
basic file up and download working
Diffstat (limited to 'web/src/js')
-rw-r--r--web/src/js/actions.js2
-rw-r--r--web/src/js/components/header.js15
2 files changed, 13 insertions, 4 deletions
diff --git a/web/src/js/actions.js b/web/src/js/actions.js
index 0f81d7a3..2f247979 100644
--- a/web/src/js/actions.js
+++ b/web/src/js/actions.js
@@ -122,7 +122,7 @@ export var FlowActions = {
upload: (file) => {
var filereader = new FileReader();
filereader.file = file;
- filereader.onload = (e) => $.post("/flows/dump", e.target.result);
+ filereader.onload = (e) => {$.post("/flows/dump", e.target.result); e.preventDefault();};
filereader.readAsBinaryString(file);
}
};
diff --git a/web/src/js/components/header.js b/web/src/js/components/header.js
index 4bb4622d..859f2fcf 100644
--- a/web/src/js/components/header.js
+++ b/web/src/js/components/header.js
@@ -344,11 +344,15 @@ var FileMenu = React.createClass({
}
},
handleOpenClick: function (e) {
+ $('#uploadFileInput').trigger('click');
e.preventDefault();
},
- handleOpenChange: function (e) {
+ handleOpenFile: function (e) {
+ if (e.target.files.length > 0) {
+ FlowActions.upload(e.target.files[0]);
+ $('#uploadFileInput').val("");
+ }
e.preventDefault();
- FlowActions.upload(e.target.files[0]);
},
handleSaveClick: function (e) {
e.preventDefault();
@@ -372,7 +376,12 @@ var FileMenu = React.createClass({
</a>
</li>
<li>
- <input type="file" onChange={this.handleOpenChange}/>
+ <a href="#" onClick={this.handleOpenClick}>
+ <i className="fa fa-fw fa-folder-open"></i>
+ Open...
+ </a>
+ <input id="uploadFileInput" className="hidden" type="file" onChange={this.handleOpenFile}/>
+
</li>
<li>
<a href="#" onClick={this.handleSaveClick}>