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

fix conflicts after rebase

This commit is contained in:
Ilya Daynatovich 2016-10-26 15:18:48 +03:00 committed by damencho
parent 09e3fb9917
commit 323684c5fe
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
css/_videolayout_default.scss
View File

@ -280,6 +280,7 @@
font-size: 8pt; font-size: 8pt;
text-align: center; text-align: center;
line-height: $thumbnailToolbarHeight; line-height: $thumbnailToolbarHeight;
display: none;
padding: 0; padding: 0;
margin-right: 5px; margin-right: 5px;
float: left; float: left;

2
modules/UI/util/UIUtil.js
View File

@ -406,7 +406,7 @@ const TOOLTIP_POSITIONS = {
getVideoThumbnailIndicatorSpan(opts = {}) { getVideoThumbnailIndicatorSpan(opts = {}) {
let indicatorId = opts.indicatorId; let indicatorId = opts.indicatorId;
let videoSpanId = opts.videoSpanId; let videoSpanId = opts.videoSpanId;
let indicators = $(`#${videoSpanId} #${indicatorId}]`); let indicators = $(`#${videoSpanId} [id="${indicatorId}"]`);
let indicatorSpan; let indicatorSpan;
if (indicators.length <= 0) { if (indicators.length <= 0) {

3
modules/UI/videolayout/ConnectionIndicator.js
View File

@ -267,13 +267,12 @@ ConnectionIndicator.prototype.create = function () {
videoSpanId: this.videoContainer.videoSpanId, videoSpanId: this.videoContainer.videoSpanId,
indicatorId indicatorId
}); });
element.classList.add('hide');
this.connectionIndicatorContainer = element; this.connectionIndicatorContainer = element;
let popoverContent = ( let popoverContent = (
`<div class="connection-info" data-i18n="${indicatorId}.na"></div>` `<div class="connection-info" data-i18n="${indicatorId}.na"></div>`
); );
this.popover = new JitsiPopover(element, { this.popover = new JitsiPopover($(element), {
content: popoverContent, content: popoverContent,
skin: "black", skin: "black",
onBeforePosition: el => APP.translation.translateElement(el) onBeforePosition: el => APP.translation.translateElement(el)

10
modules/UI/videolayout/SmallVideo.js
View File

@ -1,4 +1,4 @@
/* global $, APP, JitsiMeetJS, interfaceConfig */ /* global $, JitsiMeetJS, interfaceConfig */
import Avatar from "../avatar/Avatar"; import Avatar from "../avatar/Avatar";
import UIUtil from "../util/UIUtil"; import UIUtil from "../util/UIUtil";
import UIEvents from "../../../service/UI/UIEvents"; import UIEvents from "../../../service/UI/UIEvents";
@ -506,9 +506,9 @@ SmallVideo.prototype.showDominantSpeakerIndicator = function (show) {
}); });
if (show) { if (show) {
indicatorSpan.classList.add('hide'); indicatorSpan.classList.add('show');
} else { } else {
indicatorSpan.classList.remove('hide') indicatorSpan.classList.remove('show');
} }
}; };
@ -532,9 +532,9 @@ SmallVideo.prototype.showRaisedHandIndicator = function (show) {
}); });
if (show) { if (show) {
indicatorSpan.classList.add('hide'); indicatorSpan.classList.add('show');
} else { } else {
indicatorSpan.classList.remove('hide') indicatorSpan.classList.remove('show');
} }
}; };