Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket

Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
	web/src/js/connection.js

1 files changed, 8 insertions, 3 deletions

diff --git a/web/src/js/components/Header/MainMenu.jsx b/web/src/js/components/Header/MainMenu.jsx
index 86bf961a..7b0b542c 100644
--- a/web/src/js/components/Header/MainMenu.jsx
+++ b/web/src/js/components/Header/MainMenu.jsx
@@ -1,9 +1,10 @@
 import React, { Component, PropTypes } from 'react'
-import { SettingsActions } from "../../actions.js"
 import FilterInput from './FilterInput'
 import { Query } from '../../actions.js'
+import {setInterceptPattern} from "../../ducks/settings"
+import { connect } from 'react-redux'
 
-export default class MainMenu extends Component {
+class MainMenu extends Component {
 
     static title = 'Start'
     static route = 'flows'
@@ -28,7 +29,7 @@ export default class MainMenu extends Component {
     }
 
     onInterceptChange(val) {
-        SettingsActions.update({ intercept: val })
+        this.props.setInterceptPattern(val);
     }
 
     render() {
@@ -71,3 +72,7 @@ export default class MainMenu extends Component {
         )
     }
 }
+
+export default connect(undefined, {
+    setInterceptPattern
+})(MainMenu);