Browse Source

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

j8
damencho 9 years ago
parent
commit
aed2d97c10

+ 2
- 2
modules/UI/side_pannels/contactlist/ContactList.js View File

46
 function createDisplayNameParagraph(key, displayName) {
46
 function createDisplayNameParagraph(key, displayName) {
47
     let p = document.createElement('p');
47
     let p = document.createElement('p');
48
     if (displayName) {
48
     if (displayName) {
49
-        p.innerText = displayName;
49
+        p.innerHTML = displayName;
50
     } else if(key) {
50
     } else if(key) {
51
         p.setAttribute("data-i18n",key);
51
         p.setAttribute("data-i18n",key);
52
-        p.innerText = APP.translation.translateString(key);
52
+        p.innerHTML = APP.translation.translateString(key);
53
     }
53
     }
54
 
54
 
55
     return p;
55
     return p;

+ 2
- 4
modules/UI/videolayout/RemoteVideo.js View File

404
         nameSpan.className = 'displayname';
404
         nameSpan.className = 'displayname';
405
         $('#' + this.videoSpanId)[0].appendChild(nameSpan);
405
         $('#' + this.videoSpanId)[0].appendChild(nameSpan);
406
 
406
 
407
-
408
         if (displayName && displayName.length > 0) {
407
         if (displayName && displayName.length > 0) {
409
-            nameSpan.innerText = displayName;
408
+            nameSpan.innerHTML = displayName;
410
         }
409
         }
411
         else
410
         else
412
-            nameSpan.innerText = interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME;
413
-
411
+            nameSpan.innerHTML = interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME;
414
         nameSpan.id = this.videoSpanId + '_name';
412
         nameSpan.id = this.videoSpanId + '_name';
415
     }
413
     }
416
 };
414
 };

Loading…
Cancel
Save