From 323684c5fe3e9628dd113f32601a1f521ab0a9f9 Mon Sep 17 00:00:00 2001
From: Ilya Daynatovich <shupuercha@gmail.com>
Date: Wed, 26 Oct 2016 15:18:48 +0300
Subject: [PATCH] fix conflicts after rebase

---
 css/_videolayout_default.scss                 |  1 +
 modules/UI/util/UIUtil.js                     |  2 +-
 modules/UI/videolayout/ConnectionIndicator.js |  3 +--
 modules/UI/videolayout/SmallVideo.js          | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/css/_videolayout_default.scss b/css/_videolayout_default.scss
index cf7ee9738..df07b3fb1 100644
--- a/css/_videolayout_default.scss
+++ b/css/_videolayout_default.scss
@@ -280,6 +280,7 @@
     font-size: 8pt;
     text-align: center;
     line-height: $thumbnailToolbarHeight;
+    display: none;
     padding: 0;
     margin-right: 5px;
     float: left;
diff --git a/modules/UI/util/UIUtil.js b/modules/UI/util/UIUtil.js
index ace1dcea7..ed9235c1f 100644
--- a/modules/UI/util/UIUtil.js
+++ b/modules/UI/util/UIUtil.js
@@ -406,7 +406,7 @@ const TOOLTIP_POSITIONS = {
     getVideoThumbnailIndicatorSpan(opts = {}) {
         let indicatorId = opts.indicatorId;
         let videoSpanId = opts.videoSpanId;
-        let indicators = $(`#${videoSpanId} #${indicatorId}]`);
+        let indicators = $(`#${videoSpanId} [id="${indicatorId}"]`);
         let indicatorSpan;
 
         if (indicators.length <= 0) {
diff --git a/modules/UI/videolayout/ConnectionIndicator.js b/modules/UI/videolayout/ConnectionIndicator.js
index 59479e95b..f7836e95a 100644
--- a/modules/UI/videolayout/ConnectionIndicator.js
+++ b/modules/UI/videolayout/ConnectionIndicator.js
@@ -267,13 +267,12 @@ ConnectionIndicator.prototype.create = function () {
         videoSpanId: this.videoContainer.videoSpanId,
         indicatorId
     });
-    element.classList.add('hide');
     this.connectionIndicatorContainer = element;
 
     let popoverContent = (
         `<div class="connection-info" data-i18n="${indicatorId}.na"></div>`
     );
-    this.popover = new JitsiPopover(element, {
+    this.popover = new JitsiPopover($(element), {
         content: popoverContent,
         skin: "black",
         onBeforePosition: el => APP.translation.translateElement(el)
diff --git a/modules/UI/videolayout/SmallVideo.js b/modules/UI/videolayout/SmallVideo.js
index 43dda3303..3a491a81f 100644
--- a/modules/UI/videolayout/SmallVideo.js
+++ b/modules/UI/videolayout/SmallVideo.js
@@ -1,4 +1,4 @@
-/* global $, APP, JitsiMeetJS, interfaceConfig */
+/* global $, JitsiMeetJS, interfaceConfig */
 import Avatar from "../avatar/Avatar";
 import UIUtil from "../util/UIUtil";
 import UIEvents from "../../../service/UI/UIEvents";
@@ -506,9 +506,9 @@ SmallVideo.prototype.showDominantSpeakerIndicator = function (show) {
     });
 
     if (show) {
-        indicatorSpan.classList.add('hide');
+        indicatorSpan.classList.add('show');
     } else {
-        indicatorSpan.classList.remove('hide')
+        indicatorSpan.classList.remove('show');
     }
 };
 
@@ -532,9 +532,9 @@ SmallVideo.prototype.showRaisedHandIndicator = function (show) {
     });
 
     if (show) {
-        indicatorSpan.classList.add('hide');
+        indicatorSpan.classList.add('show');
     } else {
-        indicatorSpan.classList.remove('hide')
+        indicatorSpan.classList.remove('show');
     }
 };