diff options
author | Jason <jason.daurus@gmail.com> | 2016-06-23 01:15:14 +0800 |
---|---|---|
committer | Jason <jason.daurus@gmail.com> | 2016-06-23 01:15:14 +0800 |
commit | 72fdca49ecb6964baae6de3a5fcd93dd1ebe24f6 (patch) | |
tree | 98e243673f11680c4545a6d449c628314c8ee766 /web/src/js/connection.js | |
parent | bcea39657a0e36d289357a9097c9943eeaf8b4a3 (diff) | |
download | mitmproxy-72fdca49ecb6964baae6de3a5fcd93dd1ebe24f6.tar.gz mitmproxy-72fdca49ecb6964baae6de3a5fcd93dd1ebe24f6.tar.bz2 mitmproxy-72fdca49ecb6964baae6de3a5fcd93dd1ebe24f6.zip |
[web] connect new ducks actions
Diffstat (limited to 'web/src/js/connection.js')
-rw-r--r-- | web/src/js/connection.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/web/src/js/connection.js b/web/src/js/connection.js index 786a6394..38440a68 100644 --- a/web/src/js/connection.js +++ b/web/src/js/connection.js @@ -14,22 +14,22 @@ export default function Connection(url, dispatch) { ws.onopen = function () { dispatch(webSocketActions.connected()) dispatch(settingsActions.fetchSettings()) - dispatch(flowActions.fetchFlows()) + dispatch(eventLogActions.fetchData()) + dispatch(flowActions.fetchData()) // workaround to make sure that our state is already available. .then(() => { console.log("flows are loaded now") ConnectionActions.open() }) - dispatch(eventLogActions.fetchLogEntries()) }; ws.onmessage = function (m) { var message = JSON.parse(m.data); AppDispatcher.dispatchServerAction(message); switch (message.type) { - case eventLogActions.UPDATE_LOG: - return dispatch(eventLogActions.updateLogEntries(message)) - case flowActions.UPDATE_FLOWS: - return dispatch(flowActions.updateFlows(message)) + case eventLogActions.WS_MSG_TYPE: + return dispatch(eventLogActions.handleWsMsg(message)) + case flowActions.WS_MSG_TYPE: + return dispatch(flowActions.handleWsMsg(message)) case settingsActions.UPDATE_SETTINGS: return dispatch(settingsActions.updateSettings(message)) default: @@ -38,11 +38,11 @@ export default function Connection(url, dispatch) { }; ws.onerror = function () { ConnectionActions.error(); - dispatch(eventLogActions.addLogEntry("WebSocket connection error.")); + dispatch(eventLogActions.add("WebSocket connection error.")); }; ws.onclose = function () { ConnectionActions.close(); - dispatch(eventLogActions.addLogEntry("WebSocket connection closed.")); + dispatch(eventLogActions.add("WebSocket connection closed.")); dispatch(webSocketActions.disconnected()); }; return ws; |