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

Merge pull request #883 from jitsi/contactlist-displayname 

Syncs contactlist display names with thumbnails.
This commit is contained in:
yanas 2016-09-15 15:22:47 -05:00 committed by GitHub
parent b6e18d8a68 1a0677cb59
commit 12344ab486
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/main.json
View File

@ -5,7 +5,6 @@
"downloadlogs": "Download logs", "downloadlogs": "Download logs",
"feedback": "Give us your feedback", "feedback": "Give us your feedback",
"roomUrlDefaultMsg": "Your conference is currently being created...", "roomUrlDefaultMsg": "Your conference is currently being created...",
"participant": "Participant",
"me": "me", "me": "me",
"speaker": "Speaker", "speaker": "Speaker",
"raisedHand": "Would like to speak", "raisedHand": "Would like to speak",

2
modules/UI/UI.js
View File

@ -292,7 +292,7 @@ UI.initConference = function () {
} }
// Add myself to the contact list. // Add myself to the contact list.
ContactList.addContact(id); ContactList.addContact(id, true);
//update default button states before showing the toolbar //update default button states before showing the toolbar
//if local role changes buttons state will be again updated //if local role changes buttons state will be again updated

10
modules/UI/side_pannels/contactlist/ContactList.js
View File

@ -96,9 +96,9 @@ var ContactList = {
/** /**
* Adds a contact for the given id. * Adds a contact for the given id.
* * @param isLocal is an id for the local user.
*/ */
addContact (id) { addContact (id, isLocal) {
let contactlist = $('#contacts'); let contactlist = $('#contacts');
let newContact = document.createElement('li'); let newContact = document.createElement('li');
@ -112,7 +112,11 @@ var ContactList = {
if (interfaceConfig.SHOW_CONTACTLIST_AVATARS) if (interfaceConfig.SHOW_CONTACTLIST_AVATARS)
newContact.appendChild(createAvatar(id)); newContact.appendChild(createAvatar(id));
newContact.appendChild(createDisplayNameParagraph("participant"));
newContact.appendChild(
createDisplayNameParagraph(
isLocal ? interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME : null,
isLocal ? null : interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME));
if (APP.conference.isLocalId(id)) { if (APP.conference.isLocalId(id)) {
contactlist.prepend(newContact); contactlist.prepend(newContact);