run build/all.py

Author: valotvince

lib/text/cue.js

@@ -182,6 +182,18 @@ shaka.text.Cue = class {
      * @exportInterface
      */
     this.id = '';
+
+    /**
+     * @override
+     * @exportInterface
+     */
+    this.children = [];
+
+    /**
+     * @override
+     * @exportInterface
+     */
+    this.spacer = false;
   }
 };
 

lib/text/ttml_text_parser.js

@@ -113,15 +113,15 @@ shaka.text.TtmlTextParser = class {
           tt.getElementsByTagName('body')[0]);
 
       for (let i = 0; i < textNodes.length; i++) {
-        let cue = TtmlTextParser.parseCue_(textNodes[i],
-                                          time.periodStart,
-                                          rateInfo,
-                                          metadataElements,
-                                          styles,
-                                          regionElements,
-                                          cueRegions,
-                                          whitespaceTrim,
-                                          false);
+        const cue = TtmlTextParser.parseCue_(textNodes[i],
+            time.periodStart,
+            rateInfo,
+            metadataElements,
+            styles,
+            regionElements,
+            cueRegions,
+            whitespaceTrim,
+            false);
         if (cue) {
           ret.push(cue);
         }
@@ -155,11 +155,11 @@ shaka.text.TtmlTextParser = class {
       ) {
         // Get the leaves the child might contain.
         goog.asserts.assert(childNodeItem instanceof Element,
-                            'Node should be Element!');
+            'Node should be Element!');
         const leafChildren = shaka.text.TtmlTextParser.getLeafNodes_(
             /** @type {Element} */(childNodeItem));
         goog.asserts.assert(leafChildren.length > 0,
-                            'Only a null Element should return no leaves!');
+            'Only a null Element should return no leaves!');
 
         result = result.concat(leafChildren);
       }
@@ -193,16 +193,35 @@ shaka.text.TtmlTextParser = class {
   /**
    * Trims and removes multiple spaces from a string
    *
-   * @param {string} textContent
+   * @param {Element} element
+   * @param {boolean} whitespaceTrim
    * @return {string}
    * @private
    */
-   static sanitizeTextContent(textContent) {
-    return textContent
-      // Trim leading and trailing whitespace.
-      .trim()
-      // Collapse multiple spaces into one.
-      .replace(/\s+/g, ' ');
+  static sanitizeTextContent(element, whitespaceTrim) {
+    let payload = '';
+
+    for (let i = 0; i < element.childNodes.length; i++) {
+      const childNode = element.childNodes[i];
+
+      if (childNode.nodeName == 'br' && i > 0) {
+        payload += '\n';
+      } else if (childNode.childNodes && childNode.childNodes.length > 0) {
+        payload += shaka.text.TtmlTextParser.sanitizeTextContent(
+            /** @type {!Element} */ (childNode),
+            whitespaceTrim
+        );
+      } else if (whitespaceTrim) {
+        // Trim leading and trailing whitespace.
+        let trimmed = childNode.textContent.trim();
+        // Collapse multiple spaces into one.
+        trimmed = trimmed.replace(/\s+/g, ' ');
+
+        payload += trimmed;
+      }
+    }
+
+    return payload;
   }
 
   /**
@@ -254,31 +273,30 @@ shaka.text.TtmlTextParser = class {
         cueElement.getAttribute('dur'), rateInfo);
     let payload = '';
     const children = [];
-
+    // If one of the children is text node type
+    // stop going down and write the payload
     if (
-      cueElement.childNodes.length === 1 &&
-      cueElement.childNodes[0].nodeType === Node.TEXT_NODE
+      Array.from(cueElement.childNodes).find(
+          (childNode) => childNode.nodeType === Node.TEXT_NODE
+      )
     ) {
-      if (whitespaceTrim) {
-        payload = shaka.text.TtmlTextParser.sanitizeTextContent(
-          cueElement.textContent
-        );
-      } else {
-        payload = cueElement.textContent;
-      }
+      payload = shaka.text.TtmlTextParser.sanitizeTextContent(
+          cueElement,
+          whitespaceTrim,
+      );
     } else {
       for (let i = 0; i < cueElement.childNodes.length; i++) {
         const childNode = cueElement.childNodes[i];
         const childCue = shaka.text.TtmlTextParser.parseCue_(
-          /** @type {!Element} */ (childNode),
-          offset,
-          rateInfo,
-          metadataElements,
-          styles,
-          regionElements,
-          cueRegions,
-          whitespaceTrim,
-          true
+            /** @type {!Element} */ (childNode),
+            offset,
+            rateInfo,
+            metadataElements,
+            styles,
+            regionElements,
+            cueRegions,
+            whitespaceTrim,
+            true
         );
 
         if (childCue) {
@@ -309,10 +327,7 @@ shaka.text.TtmlTextParser = class {
         cueElement, 'region', regionElements, /* prefix= */ '')[0];
     if (regionElement && regionElement.getAttribute('xml:id')) {
       const regionId = regionElement.getAttribute('xml:id');
-      const regionsWithId = cueRegions.filter(function(region) {
-        return region.id == regionId;
-      });
-      cue.region = regionsWithId[0];
+      cue.region = cueRegions.filter((region) => region.id == regionId)[0];
     }
     const imageElement = shaka.text.TtmlTextParser.getElementFromCollection_(
         cueElement, 'smpte:backgroundImage', metadataElements, '#')[0];
@@ -668,11 +683,12 @@ shaka.text.TtmlTextParser = class {
     const XmlUtils = shaka.util.XmlUtils;
     const ttsNs = shaka.text.TtmlTextParser.styleNs_;
 
-    // Styling on elements should take precedence over the main styling attributes
+    // Styling on elements should take precedence
+    // over the main styling attributes
     const elementAttribute = XmlUtils.getAttributeNS(
-      cueElement,
-      ttsNs,
-      attribute
+        cueElement,
+        ttsNs,
+        attribute
     );
 
     if (elementAttribute) {
@@ -687,9 +703,9 @@ shaka.text.TtmlTextParser = class {
     // The last value in our styles stack takes the precedence over the others
     for (let i = 0; i < inheritedStyles.length; i++) {
       const styleAttributeValue = XmlUtils.getAttributeNS(
-        inheritedStyles[i],
-        ttsNs,
-        attribute
+          inheritedStyles[i],
+          ttsNs,
+          attribute
       );
 
       if (styleAttributeValue) {
@@ -728,18 +744,20 @@ shaka.text.TtmlTextParser = class {
       // <span style="style1 style2">A cue</span>
       const itemNames = attributeValue.split(' ');
 
-      itemNames.forEach((itemName) => {
-        for (let i = 0; i < collection.length; i++) {
-          if ((prefixName + collection[i].getAttribute('xml:id')) == itemName) {
-            items.push(collection[i]);
+      for (let i = 0; i < itemNames.length; i++) {
+        for (let k = 0; k < collection.length; k++) {
+          if (
+            (prefixName + collection[k].getAttribute('xml:id')) == itemNames[i]
+          ) {
+            items.push(collection[k]);
             break;
           }
         }
-      });
+      }
     }
 
     return items;
-  };
+  }
 
 
   /**

ui/text_displayer.js

@@ -220,9 +220,9 @@ shaka.ui.TextDisplayer = class {
       childrenContainer.style.width = '100%';
       this.setCaptionStyles_(childrenContainer, cue);
 
-      cue.children.forEach(
-        (childCue) => this.displayChildrenCue_(childrenContainer, childCue)
-      );
+      for (let i = 0; i < cue.children.length; i++) {
+        this.displayChildrenCue_(childrenContainer, cue.children[i]);
+      }
 
       container.appendChild(childrenContainer);
       this.currentCuesMap_.set(cue, childrenContainer);