Tear out login in progress logic
parent
4f0140ea36
commit
8b99f07854
|
|
@ -129,8 +129,6 @@ export default class RoomClient
|
||||||
|
|
||||||
login()
|
login()
|
||||||
{
|
{
|
||||||
this._dispatch(stateActions.setLoginInProgress(true));
|
|
||||||
|
|
||||||
const url = `/login?roomId=${this._room.roomId}&peerName=${this._peerName}`;
|
const url = `/login?roomId=${this._room.roomId}&peerName=${this._peerName}`;
|
||||||
|
|
||||||
this._loginWindow = window.open(url, 'loginWindow');
|
this._loginWindow = window.open(url, 'loginWindow');
|
||||||
|
|
|
||||||
|
|
@ -129,9 +129,7 @@ class Sidebar extends Component
|
||||||
|
|
||||||
{me.loginEnabled ?
|
{me.loginEnabled ?
|
||||||
<div
|
<div
|
||||||
className={classnames('button', 'login', 'off', {
|
className='button login off'
|
||||||
disabled : me.loginInProgress
|
|
||||||
})}
|
|
||||||
data-tip='Login'
|
data-tip='Login'
|
||||||
data-type='dark'
|
data-type='dark'
|
||||||
onClick={() => onLogin()}
|
onClick={() => onLogin()}
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@ const initialState =
|
||||||
webcamInProgress : false,
|
webcamInProgress : false,
|
||||||
audioInProgress : false,
|
audioInProgress : false,
|
||||||
screenShareInProgress : false,
|
screenShareInProgress : false,
|
||||||
loginInProgress : false,
|
|
||||||
loginEnabled : false,
|
loginEnabled : false,
|
||||||
audioOnly : false,
|
audioOnly : false,
|
||||||
audioOnlyInProgress : false,
|
audioOnlyInProgress : false,
|
||||||
|
|
@ -112,13 +111,6 @@ const me = (state = initialState, action) =>
|
||||||
return { ...state, screenShareInProgress: flag };
|
return { ...state, screenShareInProgress: flag };
|
||||||
}
|
}
|
||||||
|
|
||||||
case 'SET_LOGIN_IN_PROGRESS':
|
|
||||||
{
|
|
||||||
const { flag } = action.payload;
|
|
||||||
|
|
||||||
return { ...state, loginInProgress: flag };
|
|
||||||
}
|
|
||||||
|
|
||||||
case 'SET_DISPLAY_NAME':
|
case 'SET_DISPLAY_NAME':
|
||||||
{
|
{
|
||||||
let { displayName } = action.payload;
|
let { displayName } = action.payload;
|
||||||
|
|
|
||||||
|
|
@ -147,14 +147,6 @@ export const setMyRaiseHandState = (flag) =>
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export const setLoginInProgress = (flag) =>
|
|
||||||
{
|
|
||||||
return {
|
|
||||||
type : 'SET_LOGIN_IN_PROGRESS',
|
|
||||||
payload : { flag }
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
export const toggleSettings = () =>
|
export const toggleSettings = () =>
|
||||||
{
|
{
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue