Fix show AoT window default value

This commit is contained in:
Saúl Ibarra Corretgé 2020-04-14 10:35:33 +02:00
parent 2794692cbf
commit b72ea5a123
3 changed files with 24 additions and 2 deletions

View file

@ -8,7 +8,7 @@ import { connect } from 'react-redux';
import { push } from 'react-router-redux';
import config from '../../config';
import { setEmail, setName } from '../../settings';
import { getSetting, setEmail, setName } from '../../settings';
import { conferenceEnded, conferenceJoined } from '../actions';
import { LoadingIndicator, Wrapper } from '../styled';
@ -407,7 +407,8 @@ class Conference extends Component<Props, State> {
*/
function _mapStateToProps(state: Object) {
return {
_alwaysOnTopWindowEnabled: state.settings.alwaysOnTopWindowEnabled,
_alwaysOnTopWindowEnabled:
getSetting(state, 'alwaysOnTopWindowEnabled', true),
_avatarURL: state.settings.avatarURL,
_email: state.settings.email,
_name: state.settings.name,

View file

@ -0,0 +1,20 @@
// @flow
/**
* Get's the value for the given setting, providing a default value.
*
* @param {Object} state - The redux state.
* @param {string} setting - The name for the desired setting.
* @param {*} defaultValue - The default value, in case the setting is
* undefined.
* @returns {*} The setting value.
*/
export function getSetting(state: Object, setting: string, defaultValue: any) {
const value = state.settings[setting];
if (typeof value === 'undefined') {
return defaultValue;
}
return value;
}

View file

@ -1,6 +1,7 @@
export * from './actions';
export * from './actionTypes';
export * from './components';
export * from './functions';
export * from './styled';
export { default as middleware } from './middleware';