diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-06-19 18:27:12 -0700 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-06-19 18:27:12 -0700 |
commit | 165deb08fdb8225c8e2fea6c6025aa6534a4c771 (patch) | |
tree | ab5996776db6445dcfb152bec901142a467b9cb3 /web/src/js/components/ProxyApp.jsx | |
parent | c4c9527fa0ff2cc9299082321845739261f41f8f (diff) | |
parent | d01e49c6d5e474700956a9b7f1171a4229bfa750 (diff) | |
download | mitmproxy-165deb08fdb8225c8e2fea6c6025aa6534a4c771.tar.gz mitmproxy-165deb08fdb8225c8e2fea6c6025aa6534a4c771.tar.bz2 mitmproxy-165deb08fdb8225c8e2fea6c6025aa6534a4c771.zip |
Merge remote-tracking branch 'jason/settings'
Diffstat (limited to 'web/src/js/components/ProxyApp.jsx')
-rw-r--r-- | web/src/js/components/ProxyApp.jsx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/web/src/js/components/ProxyApp.jsx b/web/src/js/components/ProxyApp.jsx index 39cadff5..5d795b57 100644 --- a/web/src/js/components/ProxyApp.jsx +++ b/web/src/js/components/ProxyApp.jsx @@ -111,11 +111,11 @@ class ProxyAppMain extends Component { } render() { - const { showEventLog, location, children, settings } = this.props + const { showEventLog, location, children } = this.props const query = this.getQuery() return ( <div id="container" tabIndex="0" onKeyDown={this.onKeyDown}> - <Header ref="header" settings={settings} updateLocation={this.updateLocation} query={query} /> + <Header ref="header" updateLocation={this.updateLocation} query={query} /> {React.cloneElement( children, { ref: 'view', location, query, updateLocation: this.updateLocation } @@ -123,7 +123,7 @@ class ProxyAppMain extends Component { {showEventLog && ( <EventLog key="eventlog"/> )} - <Footer settings={settings}/> + <Footer /> </div> ) } @@ -132,6 +132,5 @@ class ProxyAppMain extends Component { export default connect( state => ({ showEventLog: state.eventLog.visible, - settings: state.settings.settings, }) )(ProxyAppMain) |