ZF/jitsi-meet
1
0
Fork 0
mirror of https://gitcode.com/GitHub_Trending/ji/jitsi-meet.git synced 2026-05-14 12:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(prejoin_page) Add labels for video & more UI fixes

Browse Source
This commit is contained in:
Vlad Piersec
2020-03-30 17:44:45 +03:00
committed by Saúl Ibarra Corretgé
parent 1b05d7269c
commit c05ca1d9fc
10 changed files with 146 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
react/features/settings/components/web/SettingsDialog.js
View File

@@ -127,11 +127,9 @@ class SettingsDialog extends Component<Props> {
function _mapStateToProps(state) {
const configuredTabs = interfaceConfig.SETTINGS_SECTIONS || [];
const jwt = state['features/base/jwt'];
const { prejoinPageEnabled } = state['features/base/config'];
// The settings sections to display.
const showDeviceSettings = !prejoinPageEnabled
&& configuredTabs.includes('devices');
const showDeviceSettings = configuredTabs.includes('devices');
const moreTabProps = getMoreTabProps(state);
const { showModeratorSettings, showLanguageSettings } = moreTabProps;
const showProfileSettings

2
react/features/settings/components/web/audio/AudioSettingsContent.js
View File

@@ -243,7 +243,7 @@ class AudioSettingsContent extends Component<Props, State> {
<div className = 'audio-preview-content'>
<AudioSettingsHeader
IconComponent = { IconMicrophoneEmpty }
text = { t('settings.selectMic') } />
text = { t('settings.microphones') } />
{microphoneDevices.map((data, i) =>
this._renderMicrophoneEntry(data, i),
)}

4
react/features/settings/components/web/video/VideoSettingsContent.js
View File

@@ -153,6 +153,7 @@ class VideoSettingsContent extends Component<Props, State> {
className,
key
};
const label = jitsiTrack && jitsiTrack.getTrackLabel();
if (isSelected) {
props.className = `${className} video-preview-entry--selected`;
@@ -162,6 +163,7 @@ class VideoSettingsContent extends Component<Props, State> {
return (
<div { ...props }>
<div className = 'video-preview-label'>{label}</div>
<div className = 'video-preview-overlay' />
<Video
className = { videoClassName }
@@ -209,7 +211,7 @@ class VideoSettingsContent extends Component<Props, State> {
const { trackData } = this.state;
return (
<div>
<div className = 'video-preview'>
{trackData.map((data, i) => this._renderPreviewEntry(data, i))}
</div>
);