haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

labels: don't disable all labels when VIDEO_QUALITY_LABEL_DISABLED is set 

Fixes: https://github.com/jitsi/jitsi-meet/issues/6880
This commit is contained in:
Saúl Ibarra Corretgé 2020-05-28 09:38:29 +02:00 committed by Saúl Ibarra Corretgé
parent f0c6e934ce
commit 7de88995a5
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
react/features/conference/components/web/Conference.js
View File

@ -176,8 +176,6 @@ class Conference extends AbstractConference<Props, *> {
*/
render() {
const {
VIDEO_QUALITY_LABEL_DISABLED,
// XXX The character casing of the name filmStripOnly utilized by
// interfaceConfig is obsolete but legacy support is required.
filmStripOnly: filmstripOnly
@ -187,10 +185,7 @@ class Conference extends AbstractConference<Props, *> {
_layoutClassName,
_showPrejoin
} = this.props;
const hideVideoQualityLabel
= filmstripOnly
|| VIDEO_QUALITY_LABEL_DISABLED
|| _iAmRecorder;
const hideLabels = filmstripOnly || _iAmRecorder;
return (
<div
@ -203,7 +198,7 @@ class Conference extends AbstractConference<Props, *> {
<InviteMore />
<div id = 'videospace'>
<LargeVideo />
{ hideVideoQualityLabel
{ hideLabels
|| <Labels /> }
<Filmstrip filmstripOnly = { filmstripOnly } />
</div>

5
react/features/conference/components/web/Labels.js
View File

@ -9,6 +9,8 @@ import AbstractLabels, {
type Props
} from '../AbstractLabels';
declare var interfaceConfig: Object;
/**
* The type of the React {@code Component} state of {@link Labels}.
*/
@ -67,6 +69,7 @@ class Labels extends AbstractLabels<Props, State> {
render() {
const { _filmstripVisible } = this.props;
const { filmstripBecomingVisible } = this.state;
const { VIDEO_QUALITY_LABEL_DISABLED } = interfaceConfig;
const className = `large-video-labels ${
filmstripBecomingVisible ? 'opening' : ''} ${
_filmstripVisible ? 'with-filmstrip' : 'without-filmstrip'}`;
@ -91,7 +94,7 @@ class Labels extends AbstractLabels<Props, State> {
this._renderTranscribingLabel()
}
{
this.props._showVideoQualityLabel
this.props._showVideoQualityLabel && !VIDEO_QUALITY_LABEL_DISABLED
&& this._renderVideoQualityLabel()
}
{