From 252d031238c88240385b88854d35024460bbc49a Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Sat, 18 Feb 2017 22:25:26 +1300 Subject: [PATCH] Tidying connections; Move into indexed connections --- src/js/services/pusher/middleware.js | 2 +- src/js/services/pusher/reducer.js | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/js/services/pusher/middleware.js b/src/js/services/pusher/middleware.js index 54a99aa3..5043376a 100755 --- a/src/js/services/pusher/middleware.js +++ b/src/js/services/pusher/middleware.js @@ -89,7 +89,7 @@ const PusherMiddleware = (function(){ ); socket.onopen = () => { - store.dispatch({ type: 'PUSHER_CONNECTED', connection: connection }); + store.dispatch({ type: 'PUSHER_CONNECTED', connection_id: connection.connection_id }); store.dispatch({ type: 'PUSHER_SET_USERNAME', username: connection.username }); }; diff --git a/src/js/services/pusher/reducer.js b/src/js/services/pusher/reducer.js index b1081253..49750fc1 100755 --- a/src/js/services/pusher/reducer.js +++ b/src/js/services/pusher/reducer.js @@ -7,11 +7,8 @@ export default function reducer(pusher = {}, action){ return Object.assign({}, pusher, { connected: false, connecting: true }); case 'PUSHER_CONNECTED': - return Object.assign({}, pusher, { - connected: true, - connecting: false, - connection_id: action.connection.connection_id, - username: action.connection.username + return Object.assign({}, pusher, { + connection_id: action.connection_id }); case 'PUSHER_DISCONNECTED':