Browse Source

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.
j8
paweldomas 9 years ago
parent
commit
6e0ba1de33
3 changed files with 16 additions and 15 deletions
  1. 1
    1
      css/_videolayout_default.scss
  2. 1
    1
      index.html
  3. 14
    13
      modules/UI/videolayout/LargeVideoManager.js

+ 1
- 1
css/_videolayout_default.scss View File

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

+ 1
- 1
index.html View File

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

+ 14
- 13
modules/UI/videolayout/LargeVideoManager.js View File

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

Loading…
Cancel
Save