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

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.
This commit is contained in:
paweldomas 2016-09-24 13:30:29 -05:00
parent 661ea2cf45
commit 6e0ba1de33
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/_videolayout_default.scss
View File

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

2
index.html
View File

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

27
modules/UI/videolayout/LargeVideoManager.js
View File

@ -92,9 +92,9 @@ export default class LargeVideoManager {
*/ */
onVideoInterrupted () { onVideoInterrupted () {
this.enableLocalConnectionProblemFilter(true); this.enableLocalConnectionProblemFilter(true);
this._setVideoConnectionMessage("connection.RECONNECTING") this._setLocalConnectionMessage("connection.RECONNECTING")
// Show the message only if the video is currently being displayed // Show the message only if the video is currently being displayed
this.showVideoConnectionMessage(this.state === VIDEO_CONTAINER_TYPE); this.showLocalConnectionMessage(this.state === VIDEO_CONTAINER_TYPE);
} }
/** /**
@ -102,7 +102,7 @@ export default class LargeVideoManager {
*/ */
onVideoRestored () { onVideoRestored () {
this.enableLocalConnectionProblemFilter(false); this.enableLocalConnectionProblemFilter(false);
this.showVideoConnectionMessage(false); this.showLocalConnectionMessage(false);
} }
get id () { get id () {
@ -316,23 +316,23 @@ export default class LargeVideoManager {
} }
/** /**
* Shows/hides the "video connection message". * Shows/hides the message indicating problems with local media connection.
* @param {boolean|null} show(optional) tells whether the message is to be * @param {boolean|null} show(optional) tells whether the message is to be
* displayed or not. If missing the condition will be based on the value * displayed or not. If missing the condition will be based on the value
* obtained from {@link APP.conference.isConnectionInterrupted}. * obtained from {@link APP.conference.isConnectionInterrupted}.
*/ */
showVideoConnectionMessage (show) { showLocalConnectionMessage (show) {
if (typeof show !== 'boolean') { if (typeof show !== 'boolean') {
show = APP.conference.isConnectionInterrupted(); show = APP.conference.isConnectionInterrupted();
} }
if (show) { if (show) {
$('#videoConnectionMessage').css({display: "block"}); $('#localConnectionMessage').css({display: "block"});
// Avatar message conflicts with 'videoConnectionMessage', // Avatar message conflicts with 'videoConnectionMessage',
// so it must be hidden // so it must be hidden
this.showRemoteConnectionMessage(false); this.showRemoteConnectionMessage(false);
} else { } else {
$('#videoConnectionMessage').css({display: "none"}); $('#localConnectionMessage').css({display: "none"});
} }
} }
@ -355,7 +355,7 @@ export default class LargeVideoManager {
$('#remoteConnectionMessage').css({display: "block"}); $('#remoteConnectionMessage').css({display: "block"});
// 'videoConnectionMessage' message conflicts with 'avatarMessage', // 'videoConnectionMessage' message conflicts with 'avatarMessage',
// so it must be hidden // so it must be hidden
this.showVideoConnectionMessage(false); this.showLocalConnectionMessage(false);
} else { } else {
$('#remoteConnectionMessage').hide(); $('#remoteConnectionMessage').hide();
} }
@ -382,7 +382,8 @@ export default class LargeVideoManager {
} }
/** /**
* Updated the text which is to be shown on the top of large video. * Updated the text which is to be shown on the top of large video, when
* local media connection is interrupted.
* *
* @param {string} msgKey the translation key which will be used to get * @param {string} msgKey the translation key which will be used to get
* the message text to be displayed on the large video. * the message text to be displayed on the large video.
@ -390,8 +391,8 @@ export default class LargeVideoManager {
* *
* @private * @private
*/ */
_setVideoConnectionMessage (msgKey, msgOptions) { _setLocalConnectionMessage (msgKey, msgOptions) {
$('#videoConnectionMessage') $('#localConnectionMessage')
.attr("data-i18n", msgKey) .attr("data-i18n", msgKey)
.text(APP.translation.translateString(msgKey, msgOptions)); .text(APP.translation.translateString(msgKey, msgOptions));
} }
@ -454,7 +455,7 @@ export default class LargeVideoManager {
// be taking care of it by itself, but that is a bigger refactoring // be taking care of it by itself, but that is a bigger refactoring
if (this.state === VIDEO_CONTAINER_TYPE) { if (this.state === VIDEO_CONTAINER_TYPE) {
this.showWatermark(false); this.showWatermark(false);
this.showVideoConnectionMessage(false); this.showLocalConnectionMessage(false);
this.showRemoteConnectionMessage(false); this.showRemoteConnectionMessage(false);
} }
oldContainer.hide(); oldContainer.hide();
@ -473,7 +474,7 @@ export default class LargeVideoManager {
// at the same time, but the latter is of higher priority and it // at the same time, but the latter is of higher priority and it
// will hide the avatar one if will be displayed. // will hide the avatar one if will be displayed.
this.showRemoteConnectionMessage(/* fet the current state */); this.showRemoteConnectionMessage(/* fet the current state */);
this.showVideoConnectionMessage(/* fetch the current state */); this.showLocalConnectionMessage(/* fetch the current state */);
} }
}); });
} }