Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-12-03 12:23:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #507 from legendtang/fix_flowactions

Browse Source 
fix #506
This commit is contained in:
Maximilian Hils 2015-03-06 10:00:50 +01:00
commit 8c1978b7bf
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libmproxy/web/static/app.js
View File

File diff suppressed because one or more lines are too long

3
web/src/js/components/header.js
View File

@ -5,6 +5,7 @@ var Filt = require("../filt/filt.js");
var utils = require("../utils.js"); var utils = require("../utils.js");
var common = require("./common.js"); var common = require("./common.js");
var actions = require("../actions.js");
var FilterDocs = React.createClass({ var FilterDocs = React.createClass({
statics: { statics: {
@ -275,7 +276,7 @@ var FileMenu = React.createClass({
handleNewClick: function (e) { handleNewClick: function (e) {
e.preventDefault(); e.preventDefault();
if (confirm("Delete all flows?")) { if (confirm("Delete all flows?")) {
FlowActions.clear(); actions.FlowActions.clear();
} }
}, },
handleOpenClick: function (e) { handleOpenClick: function (e) {

15
web/src/js/components/mainview.js
View File

@ -1,6 +1,7 @@
var React = require("react"); var React = require("react");
var common = require("./common.js"); var common = require("./common.js");
var actions = require("../actions.js");
var toputils = require("../utils.js"); var toputils = require("../utils.js");
var views = require("../store/view.js"); var views = require("../store/view.js");
var Filt = require("../filt/filt.js"); var Filt = require("../filt/filt.js");
@ -166,33 +167,33 @@ var MainView = React.createClass({
break; break;
case toputils.Key.C: case toputils.Key.C:
if (e.shiftKey) { if (e.shiftKey) {
FlowActions.clear(); actions.FlowActions.clear();
} }
break; break;
case toputils.Key.D: case toputils.Key.D:
if (flow) { if (flow) {
if (e.shiftKey) { if (e.shiftKey) {
FlowActions.duplicate(flow); actions.FlowActions.duplicate(flow);
} else { } else {
FlowActions.delete(flow); actions.FlowActions.delete(flow);
} }
} }
break; break;
case toputils.Key.A: case toputils.Key.A:
if (e.shiftKey) { if (e.shiftKey) {
FlowActions.accept_all(); actions.FlowActions.accept_all();
} else if (flow && flow.intercepted) { } else if (flow && flow.intercepted) {
FlowActions.accept(flow); actions.FlowActions.accept(flow);
} }
break; break;
case toputils.Key.R: case toputils.Key.R:
if (!e.shiftKey && flow) { if (!e.shiftKey && flow) {
FlowActions.replay(flow); actions.FlowActions.replay(flow);
} }
break; break;
case toputils.Key.V: case toputils.Key.V:
if(e.shiftKey && flow && flow.modified) { if(e.shiftKey && flow && flow.modified) {
FlowActions.revert(flow); actions.FlowActions.revert(flow);
} }
break; break;
default: default: