From f193d0d51d527f14436eb7849f290c5fce3c99a1 Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Fri, 27 Jun 2014 18:27:24 +0200
Subject: [PATCH] Fixes problem with local speaker removing the active speaker
 selection. Fixes problem with tooltip appearing behind video.

---
 css/videolayout_default.css |  2 +-
 videolayout.js              | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/css/videolayout_default.css b/css/videolayout_default.css
index 2e8195272..5c04ef009 100644
--- a/css/videolayout_default.css
+++ b/css/videolayout_default.css
@@ -32,6 +32,7 @@
     background-size: contain;
     border-radius:8px;
     border: 2px solid #212425;
+    margin-right: 3px;
 }
 
 #remoteVideos .videocontainer:hover,
@@ -50,7 +51,6 @@
     -webkit-animation-iteration-count: 1;
     -webkit-box-shadow: 0 0 18px #388396;
     border: 2px solid #388396;
-    z-index: 3;
 }
 
 #localVideoWrapper {
diff --git a/videolayout.js b/videolayout.js
index 881a0dba1..fc6036682 100644
--- a/videolayout.js
+++ b/videolayout.js
@@ -816,6 +816,9 @@ var VideoLayout = (function (my) {
         popupmenuElement.appendChild(ejectMenuItem);
     }
 
+    /**
+     * On audio muted event.
+     */
     $(document).bind('audiomuted.muc', function (event, jid, isMuted) {
         var videoSpanId = null;
         if (jid === connection.emuc.myroomjid) {
@@ -834,6 +837,9 @@ var VideoLayout = (function (my) {
             VideoLayout.showAudioIndicator(videoSpanId, isMuted);
     });
 
+    /**
+     * On video muted event.
+     */
     $(document).bind('videomuted.muc', function (event, jid, isMuted) {
         var videoSpanId = null;
         if (jid === connection.emuc.myroomjid) {
@@ -851,6 +857,10 @@ var VideoLayout = (function (my) {
      * On active speaker changed event.
      */
     $(document).bind('activespeakerchanged', function (event, resourceJid) {
+        // We ignore local user events.
+        if (resourceJid
+                === Strophe.getResourceFromJid(connection.emuc.myroomjid))
+            return;
 
         // Disable style for previous active speaker.
         if (currentActiveSpeaker
@@ -888,4 +898,4 @@ var VideoLayout = (function (my) {
     });
 
     return my;
-}(VideoLayout || {}));
\ No newline at end of file
+}(VideoLayout || {}));