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

code cleanup: remove redundant span.nick elements

This commit is contained in:
isymchych 2016-02-24 18:12:07 +02:00
parent 5ec28ff3c1
commit c294f592c8
4 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/videolayout_default.css
View File

@ -158,16 +158,6 @@
text-align: center; 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>span.displayname,
.videocontainer>input.displayname { .videocontainer>input.displayname {
display: none; display: none;

2
index.html
View File

@ -157,7 +157,6 @@
<div id="remoteVideos"> <div id="remoteVideos">
<span id="localVideoContainer" class="videocontainer"> <span id="localVideoContainer" class="videocontainer">
<span id="localNick" class="nick"></span>
<span id="localVideoWrapper"> <span id="localVideoWrapper">
<!--<video id="localVideo" autoplay muted></video> - is now per stream generated --> <!--<video id="localVideo" autoplay muted></video> - is now per stream generated -->
</span> </span>
@ -199,7 +198,6 @@
</form> </form>
</div> </div>
<!--div><i class="fa fa-comments">&nbsp;</i><span class='nick'></span>:&nbsp;<span class='chattext'></span></div-->
<div id="chatconversation"></div> <div id="chatconversation"></div>
<audio id="chatNotification" src="sounds/incomingMessage.wav" preload="auto"></audio> <audio id="chatNotification" src="sounds/incomingMessage.wav" preload="auto"></audio>
<textarea id="usermsg" data-i18n="[placeholder]chat.messagebox" autofocus></textarea> <textarea id="usermsg" data-i18n="[placeholder]chat.messagebox" autofocus></textarea>

6
modules/UI/UI.js
View File

@ -225,10 +225,6 @@ UI.changeDisplayName = function (id, displayName) {
UI.initConference = function () { UI.initConference = function () {
let id = APP.conference.localId; let id = APP.conference.localId;
Toolbar.updateRoomUrl(window.location.href); 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. // Add myself to the contact list.
ContactList.addContact(id); ContactList.addContact(id);
@ -243,7 +239,7 @@ UI.initConference = function () {
} }
// Make sure we configure our avatar id, before creating avatar for us // Make sure we configure our avatar id, before creating avatar for us
UI.setUserAvatar(id, email); UI.setUserAvatar(id, Settings.getEmail());
Toolbar.checkAutoEnableDesktopSharing(); Toolbar.checkAutoEnableDesktopSharing();
if(!interfaceConfig.filmStripOnly) { if(!interfaceConfig.filmStripOnly) {

4
modules/UI/videolayout/RemoteVideo.js
View File

@ -15,10 +15,6 @@ function RemoteVideo(id, VideoLayout, emitter) {
this.addRemoteVideoContainer(); this.addRemoteVideoContainer();
this.connectionIndicator = new ConnectionIndicator(this, id); this.connectionIndicator = new ConnectionIndicator(this, id);
this.setDisplayName(); this.setDisplayName();
var nickfield = document.createElement('span');
nickfield.className = "nick";
nickfield.appendChild(document.createTextNode(id));
this.container.appendChild(nickfield);
this.bindHoverHandler(); this.bindHoverHandler();
this.flipX = false; this.flipX = false;
this.isLocal = false; this.isLocal = false;