Parse HTML for titles and localization

JW8-2605
jwplayer · Jan 14, 2019 · 048780c · 048780c
1 parent 24b3d7c
commit 048780c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/js/view/controls/components/simple-tooltip.js b/src/js/view/controls/components/simple-tooltip.js
@@ -1,4 +1,4 @@
-import { addClass, removeClass } from 'utils/dom';
+import { addClass, removeClass, replaceInnerHtml } from 'utils/dom';
 
 export function SimpleTooltip(attachToElement, name, text, openCallback, closeCallback) {
     const tooltipElement = document.createElement('div');
@@ -7,7 +7,6 @@ export function SimpleTooltip(attachToElement, name, text, openCallback, closeCa
 
     const textElement = document.createElement('div');
     textElement.className = 'jw-text';
-    textElement.textContent = text;
 
     tooltipElement.appendChild(textElement);
     attachToElement.appendChild(tooltipElement);
@@ -36,10 +35,12 @@ export function SimpleTooltip(attachToElement, name, text, openCallback, closeCa
             }
         },
         setText(newText) {
-            tooltipElement.querySelector('.jw-text').textContent = newText;
+            replaceInnerHtml(textElement, newText);
         }
     };
 
+    instance.setText(text);
+
     attachToElement.addEventListener('mouseover', instance.open);
     attachToElement.addEventListener('focus', instance.open);
     attachToElement.addEventListener('blur', instance.close);

diff --git a/src/js/view/controls/info-overlay.js b/src/js/view/controls/info-overlay.js
@@ -1,5 +1,5 @@
 import InfoOverlayTemplate from 'view/controls/templates/info-overlay';
-import { createElement, prependChild } from 'utils/dom';
+import { createElement, prependChild, replaceInnerHtml } from 'utils/dom';
 import { STATE_PLAYING, STATE_PAUSED } from 'events/events';
 import button from 'view/controls/components/button';
 import { cloneIcon } from 'view/controls/icons';
@@ -37,8 +37,8 @@ export default function (container, model, api, onVisibility) {
 
         model.change('playlistItem', (changeModel, item) => {
             const { description, title } = item;
-            descriptionContainer.textContent = description || '';
-            titleContainer.textContent = title || 'Unknown Title';
+            replaceInnerHtml(descriptionContainer, description || '');
+            replaceInnerHtml(titleContainer, title || 'Unknown Title');
         });
         model.change('duration', (changeModel, duration) => {
             const streamType = model.get('streamType');

diff --git a/src/js/view/controls/play-display-icon.js b/src/js/view/controls/play-display-icon.js
@@ -44,9 +44,8 @@ export default class PlayDisplayIcon extends Eventable {
         if (_model.get('displayPlaybackLabel')) {
             let iconText = this.icon.getElementsByClassName('jw-idle-icon-text')[0];
             if (!iconText) {
-                iconText = createElement(`<div class="jw-idle-icon-text"></div>`);
+                iconText = createElement(`<div class="jw-idle-icon-text">${localization.playback}</div>`);
                 addClass(this.icon, 'jw-idle-label');
-                iconText.textContent = localization.playback;
                 this.icon.appendChild(iconText);
             }
         }