no message

shaka-project · Apr 24, 2024 · de350e5 · de350e5
2 parents 19177ab + 4302a6b
commit de350e5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/lib/text/ui_text_displayer.js b/lib/text/ui_text_displayer.js
@@ -67,7 +67,9 @@ shaka.text.UITextDisplayer = class {
 
     /** @private {shaka.util.Timer} */
     this.captionsTimer_ = new shaka.util.Timer(() => {
-      this.updateCaptions_();
+      if (!this.video_.paused) {
+        this.updateCaptions_();
+      }
     }).tickEvery(config.captionsUpdatePeriod);
 
     /**
@@ -88,6 +90,10 @@ shaka.text.UITextDisplayer = class {
       this.updateCaptions_(/* forceUpdate= */ true);
     });
 
+    this.eventManager_.listen(this.video_, 'seeking', () => {
+      this.updateCaptions_(/* forceUpdate= */ true);
+    });
+
     // From: https://html.spec.whatwg.org/multipage/media.html#dom-video-videowidth
     // Whenever the natural width or natural height of the video changes
     // (including, for example, because the selected video track was changed),
@@ -345,6 +351,9 @@ shaka.text.UITextDisplayer = class {
         const cueRegistry = this.currentCuesMap_.get(cue);
         goog.asserts.assert(cueRegistry, 'cueRegistry should exist.');
         if (cueRegistry.regionElement) {
+          if (cueRegistry.regionElement.contains(container)) {
+            cueRegistry.regionElement.removeChild(container);
+          }
           container.appendChild(cueRegistry.regionElement);
           cueRegistry.regionElement.appendChild(cueRegistry.cueElement);
         } else {
@@ -379,8 +388,10 @@ shaka.text.UITextDisplayer = class {
     if (this.isTextVisible_) {
       // Log currently attached cue elements for verification, later.
       const previousCuesMap = new Map();
-      for (const cue of this.currentCuesMap_.keys()) {
-        previousCuesMap.set(cue, this.currentCuesMap_.get(cue));
+      if (goog.DEBUG) {
+        for (const cue of this.currentCuesMap_.keys()) {
+          previousCuesMap.set(cue, this.currentCuesMap_.get(cue));
+        }
       }
 
       // Update the cues.

diff --git a/lib/util/tXml.js b/lib/util/tXml.js
@@ -755,7 +755,7 @@ shaka.util.TXml = class {
         returnPaths.push({
           name: nodeName[0],
           id: idAttr ?
-            idAttr[0].match(/'(.*?)'/)[0].replaceAll('\'', '') : null,
+            idAttr[0].match(/'(.*?)'/)[0].replace(/'/gm, '') : null,
         });
       }
     }