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

Fixes displayname on remote video on FF. Seems innerText is not working on FF, replace it with innerHTML.

This commit is contained in:
damencho 2016-01-14 16:34:22 -06:00
parent dcb607a586
commit aed2d97c10
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,10 +46,10 @@ function createAvatar(jid) {
function createDisplayNameParagraph(key, displayName) {
let p = document.createElement('p');
if (displayName) {
p.innerText = displayName;
p.innerHTML = displayName;
} else if(key) {
p.setAttribute("data-i18n",key);
p.innerText = APP.translation.translateString(key);
p.innerHTML = APP.translation.translateString(key);
}
return p;

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

@ -404,13 +404,11 @@ RemoteVideo.prototype.setDisplayName = function(displayName, key) {
nameSpan.className = 'displayname';
$('#' + this.videoSpanId)[0].appendChild(nameSpan);
if (displayName && displayName.length > 0) {
nameSpan.innerText = displayName;
nameSpan.innerHTML = displayName;
}
else
nameSpan.innerText = interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME;
nameSpan.innerHTML = interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME;
nameSpan.id = this.videoSpanId + '_name';
}
};