From af91fb50b21ce57b041d9218825ffcdf62ac303e Mon Sep 17 00:00:00 2001
From: yanas <yana@jitsi.org>
Date: Fri, 23 Sep 2016 17:42:29 -0500
Subject: [PATCH] Fixes moderator related elements when everyone is moderator

---
 index.html                            | 1 -
 modules/UI/UI.js                      | 6 +++---
 modules/UI/videolayout/VideoLayout.js | 5 +++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index 0cae4698f..48c8e1e3a 100644
--- a/index.html
+++ b/index.html
@@ -245,7 +245,6 @@
                         <!--<video id="localVideo" autoplay muted></video> - is now per stream generated -->
                     </span>
                     <audio id="localAudio" autoplay muted></audio>
-                    <span class="focusindicator"></span>
                     <div class="videocontainer__toolbar"></div>
                 </span>
                 <audio id="userJoined" src="sounds/joined.wav" preload="auto"></audio>
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 88b53343e..22802db3d 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -298,9 +298,9 @@ UI.initConference = function () {
     // Add myself to the contact list.
     ContactList.addContact(id, true);
 
-    //update default button states before showing the toolbar
-    //if local role changes buttons state will be again updated
-    UI.updateLocalRole(false);
+    // Update default button states before showing the toolbar
+    // if local role changes buttons state will be again updated.
+    UI.updateLocalRole(APP.conference.isModerator);
 
     UI.showToolbar();
 
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index 78f8db9c6..cbb229293 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -465,9 +465,10 @@ var VideoLayout = {
                 return;
 
             if (member.isModerator()) {
-                remoteVideo.removeRemoteVideoMenu();
                 remoteVideo.createModeratorIndicatorElement();
-            } else if (isModerator) {
+            }
+
+            if (isModerator) {
                 // We are moderator, but user is not - add menu
                 if(!remoteVideo.hasRemoteVideoMenu) {
                     remoteVideo.addRemoteVideoMenu();