aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js
diff options
context:
space:
mode:
authorLegend Tang <sp3478@gmail.com>2015-03-06 16:54:18 +0800
committerLegend Tang <sp3478@gmail.com>2015-03-06 16:54:18 +0800
commitde306e6aeb4eda3fcb9f6568917c151977054fdd (patch)
treee400e534f14526f6e52b21c0428a02557a2ce9e7 /web/src/js
parent300868edff433f0f895a83482e0e7d92fa9e815e (diff)
downloadmitmproxy-de306e6aeb4eda3fcb9f6568917c151977054fdd.tar.gz
mitmproxy-de306e6aeb4eda3fcb9f6568917c151977054fdd.tar.bz2
mitmproxy-de306e6aeb4eda3fcb9f6568917c151977054fdd.zip
fix #506
Diffstat (limited to 'web/src/js')
-rw-r--r--web/src/js/components/header.js3
-rw-r--r--web/src/js/components/mainview.js15
2 files changed, 10 insertions, 8 deletions
diff --git a/web/src/js/components/header.js b/web/src/js/components/header.js
index c8f4ce3b..76a1a5fb 100644
--- a/web/src/js/components/header.js
+++ b/web/src/js/components/header.js
@@ -5,6 +5,7 @@ var Filt = require("../filt/filt.js");
var utils = require("../utils.js");
var common = require("./common.js");
+var actions = require("../actions.js");
var FilterDocs = React.createClass({
statics: {
@@ -275,7 +276,7 @@ var FileMenu = React.createClass({
handleNewClick: function (e) {
e.preventDefault();
if (confirm("Delete all flows?")) {
- FlowActions.clear();
+ actions.FlowActions.clear();
}
},
handleOpenClick: function (e) {
diff --git a/web/src/js/components/mainview.js b/web/src/js/components/mainview.js
index a98007ec..6c91529d 100644
--- a/web/src/js/components/mainview.js
+++ b/web/src/js/components/mainview.js
@@ -1,6 +1,7 @@
var React = require("react");
var common = require("./common.js");
+var actions = require("../actions.js");
var toputils = require("../utils.js");
var views = require("../store/view.js");
var Filt = require("../filt/filt.js");
@@ -166,33 +167,33 @@ var MainView = React.createClass({
break;
case toputils.Key.C:
if (e.shiftKey) {
- FlowActions.clear();
+ actions.FlowActions.clear();
}
break;
case toputils.Key.D:
if (flow) {
if (e.shiftKey) {
- FlowActions.duplicate(flow);
+ actions.FlowActions.duplicate(flow);
} else {
- FlowActions.delete(flow);
+ actions.FlowActions.delete(flow);
}
}
break;
case toputils.Key.A:
if (e.shiftKey) {
- FlowActions.accept_all();
+ actions.FlowActions.accept_all();
} else if (flow && flow.intercepted) {
- FlowActions.accept(flow);
+ actions.FlowActions.accept(flow);
}
break;
case toputils.Key.R:
if (!e.shiftKey && flow) {
- FlowActions.replay(flow);
+ actions.FlowActions.replay(flow);
}
break;
case toputils.Key.V:
if(e.shiftKey && flow && flow.modified) {
- FlowActions.revert(flow);
+ actions.FlowActions.revert(flow);
}
break;
default: