Переглянути джерело

ref(VideoLayout): rename 'videoConnectionMessage'

Renames 'videoConnectionMessage' to 'localConnectionMessage', because
it is displayed when we're having problems with our local connection
and a different one will be shown for the remote connectivity issues.
master
paweldomas 8 роки тому
джерело
коміт
6e0ba1de33

+ 1
- 1
css/_videolayout_default.scss Переглянути файл

@@ -487,7 +487,7 @@
487 487
     padding-right: 10px;
488 488
 }
489 489
 
490
-#videoConnectionMessage {
490
+#localConnectionMessage {
491 491
     display: none;
492 492
     position: absolute;
493 493
     width: 100%;

+ 1
- 1
index.html Переглянути файл

@@ -232,7 +232,7 @@
232 232
                 <div id="largeVideoWrapper">
233 233
                     <video id="largeVideo" muted="true" autoplay></video>
234 234
                 </div>
235
-                <span id="videoConnectionMessage"></span>
235
+                <span id="localConnectionMessage"></span>
236 236
                 <span id="videoResolutionLabel">HD</span>
237 237
                 <span id="recordingLabel" class="centeredVideoLabel">
238 238
                     <span id="recordingLabelText"></span>

+ 14
- 13
modules/UI/videolayout/LargeVideoManager.js Переглянути файл

@@ -92,9 +92,9 @@ export default class LargeVideoManager {
92 92
      */
93 93
     onVideoInterrupted () {
94 94
         this.enableLocalConnectionProblemFilter(true);
95
-        this._setVideoConnectionMessage("connection.RECONNECTING")
95
+        this._setLocalConnectionMessage("connection.RECONNECTING")
96 96
         // Show the message only if the video is currently being displayed
97
-        this.showVideoConnectionMessage(this.state === VIDEO_CONTAINER_TYPE);
97
+        this.showLocalConnectionMessage(this.state === VIDEO_CONTAINER_TYPE);
98 98
     }
99 99
 
100 100
     /**
@@ -102,7 +102,7 @@ export default class LargeVideoManager {
102 102
      */
103 103
     onVideoRestored () {
104 104
         this.enableLocalConnectionProblemFilter(false);
105
-        this.showVideoConnectionMessage(false);
105
+        this.showLocalConnectionMessage(false);
106 106
     }
107 107
 
108 108
     get id () {
@@ -316,23 +316,23 @@ export default class LargeVideoManager {
316 316
     }
317 317
 
318 318
     /**
319
-     * Shows/hides the "video connection message".
319
+     * Shows/hides the message indicating problems with local media connection.
320 320
      * @param {boolean|null} show(optional) tells whether the message is to be
321 321
      * displayed or not. If missing the condition will be based on the value
322 322
      * obtained from {@link APP.conference.isConnectionInterrupted}.
323 323
      */
324
-    showVideoConnectionMessage (show) {
324
+    showLocalConnectionMessage (show) {
325 325
         if (typeof show !== 'boolean') {
326 326
             show = APP.conference.isConnectionInterrupted();
327 327
         }
328 328
 
329 329
         if (show) {
330
-            $('#videoConnectionMessage').css({display: "block"});
330
+            $('#localConnectionMessage').css({display: "block"});
331 331
             // Avatar message conflicts with 'videoConnectionMessage',
332 332
             // so it must be hidden
333 333
             this.showRemoteConnectionMessage(false);
334 334
         } else {
335
-            $('#videoConnectionMessage').css({display: "none"});
335
+            $('#localConnectionMessage').css({display: "none"});
336 336
         }
337 337
     }
338 338
 
@@ -355,7 +355,7 @@ export default class LargeVideoManager {
355 355
             $('#remoteConnectionMessage').css({display: "block"});
356 356
             // 'videoConnectionMessage' message conflicts with 'avatarMessage',
357 357
             // so it must be hidden
358
-            this.showVideoConnectionMessage(false);
358
+            this.showLocalConnectionMessage(false);
359 359
         } else {
360 360
             $('#remoteConnectionMessage').hide();
361 361
         }
@@ -382,7 +382,8 @@ export default class LargeVideoManager {
382 382
     }
383 383
 
384 384
     /**
385
-     * Updated the text which is to be shown on the top of large video.
385
+     * Updated the text which is to be shown on the top of large video, when
386
+     * local media connection is interrupted.
386 387
      *
387 388
      * @param {string} msgKey the translation key which will be used to get
388 389
      * the message text to be displayed on the large video.
@@ -390,8 +391,8 @@ export default class LargeVideoManager {
390 391
      *
391 392
      * @private
392 393
      */
393
-    _setVideoConnectionMessage (msgKey, msgOptions) {
394
-        $('#videoConnectionMessage')
394
+    _setLocalConnectionMessage (msgKey, msgOptions) {
395
+        $('#localConnectionMessage')
395 396
             .attr("data-i18n", msgKey)
396 397
             .text(APP.translation.translateString(msgKey, msgOptions));
397 398
     }
@@ -454,7 +455,7 @@ export default class LargeVideoManager {
454 455
         // be taking care of it by itself, but that is a bigger refactoring
455 456
         if (this.state === VIDEO_CONTAINER_TYPE) {
456 457
             this.showWatermark(false);
457
-            this.showVideoConnectionMessage(false);
458
+            this.showLocalConnectionMessage(false);
458 459
             this.showRemoteConnectionMessage(false);
459 460
         }
460 461
         oldContainer.hide();
@@ -473,7 +474,7 @@ export default class LargeVideoManager {
473 474
                 // at the same time, but the latter is of higher priority and it
474 475
                 // will hide the avatar one if will be displayed.
475 476
                 this.showRemoteConnectionMessage(/* fet the current state */);
476
-                this.showVideoConnectionMessage(/* fetch the current state */);
477
+                this.showLocalConnectionMessage(/* fetch the current state */);
477 478
             }
478 479
         });
479 480
     }

Завантаження…
Відмінити
Зберегти