diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-08-15 23:13:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-15 23:13:57 -0700 |
| commit | f9f0ac848e8a691a78d4458f3d25f21b3e943658 (patch) | |
| tree | f7b81554206afbc221b9eaaf1b6dead713f26a74 /web/src/js/components/MainView.jsx | |
| parent | 2419ab153d3ce215e719b434f5f69405be9a6586 (diff) | |
| parent | 81b726bab1cc403977ef4aea060f88ab8a0a66fd (diff) | |
| download | mitmproxy-f9f0ac848e8a691a78d4458f3d25f21b3e943658.tar.gz mitmproxy-f9f0ac848e8a691a78d4458f3d25f21b3e943658.tar.bz2 mitmproxy-f9f0ac848e8a691a78d4458f3d25f21b3e943658.zip | |
Merge pull request #1483 from gzzhanghao/history
[web] Use history object instead of react-router
Diffstat (limited to 'web/src/js/components/MainView.jsx')
| -rw-r--r-- | web/src/js/components/MainView.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/src/js/components/MainView.jsx b/web/src/js/components/MainView.jsx index f45f9eef..8be6f21c 100644 --- a/web/src/js/components/MainView.jsx +++ b/web/src/js/components/MainView.jsx @@ -29,8 +29,7 @@ class MainView extends Component { <FlowView key="flowDetails" ref="flowDetails" - tab={this.props.routeParams.detailTab} - query={this.props.query} + tab={this.props.tab} updateFlow={data => this.props.updateFlow(selectedFlow, data)} flow={selectedFlow} /> @@ -45,7 +44,8 @@ export default connect( flows: state.flowView.data, filter: state.flowView.filter, highlight: state.flowView.highlight, - selectedFlow: state.flows.byId[state.flows.selected[0]] + selectedFlow: state.flows.byId[state.flows.selected[0]], + tab: state.ui.flow.tab, }), { selectFlow: flowsActions.select, |