From c294f592c8d64bdd9091b64b72ab5091e3ee560a Mon Sep 17 00:00:00 2001
From: isymchych <ivansymchych@gmail.com>
Date: Wed, 24 Feb 2016 18:12:07 +0200
Subject: [PATCH] code cleanup: remove redundant span.nick elements

---
 css/videolayout_default.css           | 10 ----------
 index.html                            |  2 --
 modules/UI/UI.js                      |  6 +-----
 modules/UI/videolayout/RemoteVideo.js |  4 ----
 4 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/css/videolayout_default.css b/css/videolayout_default.css
index e2fc9b04b..73668cf56 100644
--- a/css/videolayout_default.css
+++ b/css/videolayout_default.css
@@ -158,16 +158,6 @@
     text-align: center;
 }
 
-#remoteVideos .nick {
-    display: none; /* enable when you want nicks to be shown */
-    position: absolute;
-    left: 0px;
-    bottom: -20px;
-    z-index: 0;
-    width: 100%;
-    font-size: 10pt;
-}
-
 .videocontainer>span.displayname,
 .videocontainer>input.displayname {
     display: none;
diff --git a/index.html b/index.html
index 15462c16c..22b2e0a3f 100644
--- a/index.html
+++ b/index.html
@@ -157,7 +157,6 @@
 
             <div id="remoteVideos">
                 <span id="localVideoContainer" class="videocontainer">
-                    <span id="localNick" class="nick"></span>
                     <span id="localVideoWrapper">
                         <!--<video id="localVideo" autoplay muted></video> - is now per stream generated -->
                     </span>
@@ -199,7 +198,6 @@
                 </form>
             </div>
 
-            <!--div><i class="fa fa-comments">&nbsp;</i><span class='nick'></span>:&nbsp;<span class='chattext'></span></div-->
             <div id="chatconversation"></div>
             <audio id="chatNotification" src="sounds/incomingMessage.wav" preload="auto"></audio>
                 <textarea id="usermsg" data-i18n="[placeholder]chat.messagebox" autofocus></textarea>
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 246564589..00d7c4024 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -225,10 +225,6 @@ UI.changeDisplayName = function (id, displayName) {
 UI.initConference = function () {
     let id = APP.conference.localId;
     Toolbar.updateRoomUrl(window.location.href);
-    let meHTML = APP.translation.generateTranslationHTML("me");
-
-    let email = Settings.getEmail();
-    $("#localNick").html(email || `${id} (${meHTML})`);
 
     // Add myself to the contact list.
     ContactList.addContact(id);
@@ -243,7 +239,7 @@ UI.initConference = function () {
     }
 
     // Make sure we configure our avatar id, before creating avatar for us
-    UI.setUserAvatar(id, email);
+    UI.setUserAvatar(id, Settings.getEmail());
 
     Toolbar.checkAutoEnableDesktopSharing();
     if(!interfaceConfig.filmStripOnly) {
diff --git a/modules/UI/videolayout/RemoteVideo.js b/modules/UI/videolayout/RemoteVideo.js
index f0bb32155..a502d9693 100644
--- a/modules/UI/videolayout/RemoteVideo.js
+++ b/modules/UI/videolayout/RemoteVideo.js
@@ -15,10 +15,6 @@ function RemoteVideo(id, VideoLayout, emitter) {
     this.addRemoteVideoContainer();
     this.connectionIndicator = new ConnectionIndicator(this, id);
     this.setDisplayName();
-    var nickfield = document.createElement('span');
-    nickfield.className = "nick";
-    nickfield.appendChild(document.createTextNode(id));
-    this.container.appendChild(nickfield);
     this.bindHoverHandler();
     this.flipX = false;
     this.isLocal = false;