浏览代码

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

Fixes: https://github.com/jitsi/jitsi-meet/issues/6880
j8
Saúl Ibarra Corretgé 5 年前
父节点
当前提交
7de88995a5

+ 2
- 7
react/features/conference/components/web/Conference.js 查看文件

@@ -176,8 +176,6 @@ class Conference extends AbstractConference<Props, *> {
176 176
      */
177 177
     render() {
178 178
         const {
179
-            VIDEO_QUALITY_LABEL_DISABLED,
180
-
181 179
             // XXX The character casing of the name filmStripOnly utilized by
182 180
             // interfaceConfig is obsolete but legacy support is required.
183 181
             filmStripOnly: filmstripOnly
@@ -187,10 +185,7 @@ class Conference extends AbstractConference<Props, *> {
187 185
             _layoutClassName,
188 186
             _showPrejoin
189 187
         } = this.props;
190
-        const hideVideoQualityLabel
191
-            = filmstripOnly
192
-                || VIDEO_QUALITY_LABEL_DISABLED
193
-                || _iAmRecorder;
188
+        const hideLabels = filmstripOnly || _iAmRecorder;
194 189
 
195 190
         return (
196 191
             <div
@@ -203,7 +198,7 @@ class Conference extends AbstractConference<Props, *> {
203 198
                 <InviteMore />
204 199
                 <div id = 'videospace'>
205 200
                     <LargeVideo />
206
-                    { hideVideoQualityLabel
201
+                    { hideLabels
207 202
                         || <Labels /> }
208 203
                     <Filmstrip filmstripOnly = { filmstripOnly } />
209 204
                 </div>

+ 4
- 1
react/features/conference/components/web/Labels.js 查看文件

@@ -9,6 +9,8 @@ import AbstractLabels, {
9 9
     type Props
10 10
 } from '../AbstractLabels';
11 11
 
12
+declare var interfaceConfig: Object;
13
+
12 14
 /**
13 15
  * The type of the React {@code Component} state of {@link Labels}.
14 16
  */
@@ -67,6 +69,7 @@ class Labels extends AbstractLabels<Props, State> {
67 69
     render() {
68 70
         const { _filmstripVisible } = this.props;
69 71
         const { filmstripBecomingVisible } = this.state;
72
+        const { VIDEO_QUALITY_LABEL_DISABLED } = interfaceConfig;
70 73
         const className = `large-video-labels ${
71 74
             filmstripBecomingVisible ? 'opening' : ''} ${
72 75
             _filmstripVisible ? 'with-filmstrip' : 'without-filmstrip'}`;
@@ -91,7 +94,7 @@ class Labels extends AbstractLabels<Props, State> {
91 94
                     this._renderTranscribingLabel()
92 95
                 }
93 96
                 {
94
-                    this.props._showVideoQualityLabel
97
+                    this.props._showVideoQualityLabel && !VIDEO_QUALITY_LABEL_DISABLED
95 98
                         && this._renderVideoQualityLabel()
96 99
                 }
97 100
                 {

正在加载...
取消
保存