diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-07-19 23:35:42 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-19 23:35:42 +1200 |
| commit | 6000136b01fe16fc2747c739db878b51e0313006 (patch) | |
| tree | ec794b33494e1ffd9b8f1c00d3ca275f8fd411d1 /web/src/js/components/Header.jsx | |
| parent | 09fbebf42a88115ac98ad9bc86947fd1b6771a5d (diff) | |
| parent | 18dd84b9081fb5552d5b5b2560405496445e2110 (diff) | |
| download | mitmproxy-6000136b01fe16fc2747c739db878b51e0313006.tar.gz mitmproxy-6000136b01fe16fc2747c739db878b51e0313006.tar.bz2 mitmproxy-6000136b01fe16fc2747c739db878b51e0313006.zip | |
Merge branch 'master' into cleanup
Diffstat (limited to 'web/src/js/components/Header.jsx')
| -rw-r--r-- | web/src/js/components/Header.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/src/js/components/Header.jsx b/web/src/js/components/Header.jsx index 7f1fa69f..5de885ae 100644 --- a/web/src/js/components/Header.jsx +++ b/web/src/js/components/Header.jsx @@ -17,10 +17,10 @@ class Header extends Component { } render() { - const { query, selectedFlow, activeMenu} = this.props + const { query, selectedFlowId, activeMenu} = this.props let entries = [...Header.entries] - if(selectedFlow) + if(selectedFlowId) entries.push(FlowMenu) const Active = _.find(entries, (e) => e.title == activeMenu) @@ -51,7 +51,7 @@ class Header extends Component { export default connect( state => ({ - selectedFlow: state.flows.views.main.selected[0], + selectedFlowId: state.flows.selected[0], activeMenu: state.ui.activeMenu, }), { |