From aed2d97c109e9dd809b5fad5cda854791554d7d9 Mon Sep 17 00:00:00 2001 From: damencho Date: Thu, 14 Jan 2016 16:34:22 -0600 Subject: [PATCH] Fixes displayname on remote video on FF. Seems innerText is not working on FF, replace it with innerHTML. --- modules/UI/side_pannels/contactlist/ContactList.js | 4 ++-- modules/UI/videolayout/RemoteVideo.js | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/UI/side_pannels/contactlist/ContactList.js b/modules/UI/side_pannels/contactlist/ContactList.js index 8a2ba041e..ca4e8530f 100644 --- a/modules/UI/side_pannels/contactlist/ContactList.js +++ b/modules/UI/side_pannels/contactlist/ContactList.js @@ -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; diff --git a/modules/UI/videolayout/RemoteVideo.js b/modules/UI/videolayout/RemoteVideo.js index 9ac07a3a6..b3749a890 100644 --- a/modules/UI/videolayout/RemoteVideo.js +++ b/modules/UI/videolayout/RemoteVideo.js @@ -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'; } };