aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/components
diff options
context:
space:
mode:
authorJason <jason.daurus@gmail.com>2016-06-15 01:18:10 +0800
committerJason <jason.daurus@gmail.com>2016-06-17 07:26:29 +0800
commit16a28eca258e07d45c7e2a8ee95368d4eb077d4d (patch)
tree50c0bf08f6b2e59ca363e022fb4c9ee6729301c4 /web/src/js/components
parent1fc2db85fa339f9b134d45c15d2ad4cf3d681070 (diff)
downloadmitmproxy-16a28eca258e07d45c7e2a8ee95368d4eb077d4d.tar.gz
mitmproxy-16a28eca258e07d45c7e2a8ee95368d4eb077d4d.tar.bz2
mitmproxy-16a28eca258e07d45c7e2a8ee95368d4eb077d4d.zip
[web] websocket
Diffstat (limited to 'web/src/js/components')
-rw-r--r--web/src/js/components/ProxyApp.jsx28
1 files changed, 18 insertions, 10 deletions
diff --git a/web/src/js/components/ProxyApp.jsx b/web/src/js/components/ProxyApp.jsx
index 81272268..2aedba7c 100644
--- a/web/src/js/components/ProxyApp.jsx
+++ b/web/src/js/components/ProxyApp.jsx
@@ -1,14 +1,15 @@
-import React, { Component, PropTypes } from "react"
-import ReactDOM from "react-dom"
-import _ from "lodash"
+import React, { Component, PropTypes } from 'react'
+import ReactDOM from 'react-dom'
+import _ from 'lodash'
import { connect } from 'react-redux'
-import { Splitter } from "./common.js"
-import Header from "./Header"
-import EventLog from "./EventLog"
-import Footer from "./Footer"
-import { SettingsStore } from "../store/store.js"
-import { Key } from "../utils.js"
+import { Splitter } from './common.js'
+import { connect as wsConnect } from '../ducks/websocket'
+import Header from './Header'
+import EventLog from './EventLog'
+import Footer from './Footer'
+import { SettingsStore } from '../store/store.js'
+import { Key } from '../utils.js'
class ProxyAppMain extends Component {
@@ -37,6 +38,10 @@ class ProxyAppMain extends Component {
this.onSettingsChange = this.onSettingsChange.bind(this)
}
+ componentWillMount() {
+ this.props.wsConnect()
+ }
+
/**
* @todo move to actions
*/
@@ -166,5 +171,8 @@ class ProxyAppMain extends Component {
export default connect(
state => ({
showEventLog: state.eventLog.visible
- })
+ }),
+ {
+ wsConnect,
+ }
)(ProxyAppMain)