diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-03-09 18:54:34 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-03-09 18:54:34 +0100 |
commit | b413a052f96896d387f58e903203cf2e29c6f1f6 (patch) | |
tree | 8c6b01421427c0d5e70146e3ac515841debfa67d /web/src/js | |
parent | 454cca43f034c59e576df151fa1ba3489b0b37af (diff) | |
parent | df8b21c08f98ead06ed371e475ad1dd22e28c74c (diff) | |
download | mitmproxy-b413a052f96896d387f58e903203cf2e29c6f1f6.tar.gz mitmproxy-b413a052f96896d387f58e903203cf2e29c6f1f6.tar.bz2 mitmproxy-b413a052f96896d387f58e903203cf2e29c6f1f6.zip |
Merge pull request #1012 from gzzhanghao/router
[web] eliminate common.Router.getParams
Diffstat (limited to 'web/src/js')
-rw-r--r-- | web/src/js/components/common.js | 3 | ||||
-rw-r--r-- | web/src/js/components/mainview.js | 14 |
2 files changed, 7 insertions, 10 deletions
diff --git a/web/src/js/components/common.js b/web/src/js/components/common.js index 447e6eec..23e0a434 100644 --- a/web/src/js/components/common.js +++ b/web/src/js/components/common.js @@ -53,9 +53,6 @@ export var Router = { // For whatever reason, react-router always returns the same object, which makes comparing // the current props with nextProps impossible. As a workaround, we just clone the query object. return _.clone(this.context.location.query); - }, - getParams: function() { - return this.props.routeParams; } }; diff --git a/web/src/js/components/mainview.js b/web/src/js/components/mainview.js index cc1f05ae..87c0c4bd 100644 --- a/web/src/js/components/mainview.js +++ b/web/src/js/components/mainview.js @@ -75,12 +75,12 @@ var MainView = React.createClass({ } }, onUpdate: function (flow) { - if (flow.id === this.getParams().flowId) { + if (flow.id === this.props.routeParams.flowId) { this.forceUpdate(); } }, onRemove: function (flow_id, index) { - if (flow_id === this.getParams().flowId) { + if (flow_id === this.props.routeParams.flowId) { var flow_to_select = this.state.view.list[Math.min(index, this.state.view.list.length - 1)]; this.selectFlow(flow_to_select); } @@ -93,7 +93,7 @@ var MainView = React.createClass({ }, selectFlow: function (flow) { if (flow) { - var tab = this.getParams().detailTab || "request"; + var tab = this.props.routeParams.detailTab || "request"; this.updateLocation(`/flows/${flow.id}/${tab}`); this.refs.flowTable.scrollIntoView(flow); } else { @@ -103,14 +103,14 @@ var MainView = React.createClass({ selectFlowRelative: function (shift) { var flows = this.state.view.list; var index; - if (!this.getParams().flowId) { + if (!this.props.routeParams.flowId) { if (shift < 0) { index = flows.length - 1; } else { index = 0; } } else { - var currFlowId = this.getParams().flowId; + var currFlowId = this.props.routeParams.flowId; var i = flows.length; while (i--) { if (flows[i].id === currFlowId) { @@ -212,7 +212,7 @@ var MainView = React.createClass({ e.preventDefault(); }, getSelected: function () { - return this.context.flowStore.get(this.getParams().flowId); + return this.context.flowStore.get(this.props.routeParams.flowId); }, render: function () { var selected = this.getSelected(); @@ -224,7 +224,7 @@ var MainView = React.createClass({ <FlowView key="flowDetails" ref="flowDetails" - tab={this.getParams().detailTab} + tab={this.props.routeParams.detailTab} flow={selected}/> ]; } else { |