From 8b99f0785421923c46135bf5744e7de7d7aef642 Mon Sep 17 00:00:00 2001 From: Torjus Date: Mon, 23 Jul 2018 13:47:46 +0200 Subject: [PATCH] Tear out login in progress logic --- app/lib/RoomClient.js | 2 -- app/lib/components/Sidebar.jsx | 4 +--- app/lib/redux/reducers/me.js | 8 -------- app/lib/redux/stateActions.js | 8 -------- 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/app/lib/RoomClient.js b/app/lib/RoomClient.js index 9b7a338..42c9265 100644 --- a/app/lib/RoomClient.js +++ b/app/lib/RoomClient.js @@ -129,8 +129,6 @@ export default class RoomClient login() { - this._dispatch(stateActions.setLoginInProgress(true)); - const url = `/login?roomId=${this._room.roomId}&peerName=${this._peerName}`; this._loginWindow = window.open(url, 'loginWindow'); diff --git a/app/lib/components/Sidebar.jsx b/app/lib/components/Sidebar.jsx index 1631c7c..40598c6 100644 --- a/app/lib/components/Sidebar.jsx +++ b/app/lib/components/Sidebar.jsx @@ -129,9 +129,7 @@ class Sidebar extends Component {me.loginEnabled ?
onLogin()} diff --git a/app/lib/redux/reducers/me.js b/app/lib/redux/reducers/me.js index 0b8db12..0c4e794 100644 --- a/app/lib/redux/reducers/me.js +++ b/app/lib/redux/reducers/me.js @@ -15,7 +15,6 @@ const initialState = webcamInProgress : false, audioInProgress : false, screenShareInProgress : false, - loginInProgress : false, loginEnabled : false, audioOnly : false, audioOnlyInProgress : false, @@ -112,13 +111,6 @@ const me = (state = initialState, action) => return { ...state, screenShareInProgress: flag }; } - case 'SET_LOGIN_IN_PROGRESS': - { - const { flag } = action.payload; - - return { ...state, loginInProgress: flag }; - } - case 'SET_DISPLAY_NAME': { let { displayName } = action.payload; diff --git a/app/lib/redux/stateActions.js b/app/lib/redux/stateActions.js index 2c51b02..ecc7945 100644 --- a/app/lib/redux/stateActions.js +++ b/app/lib/redux/stateActions.js @@ -147,14 +147,6 @@ export const setMyRaiseHandState = (flag) => }; }; -export const setLoginInProgress = (flag) => -{ - return { - type : 'SET_LOGIN_IN_PROGRESS', - payload : { flag } - }; -}; - export const toggleSettings = () => { return {