@d-i-t-a/reader 2.0.0-beta.10 → 2.0.0-beta.13

package/dist/esm/index.js

@@ -52390,6 +52390,7 @@ var MediaOverlaySettings = class {
     this.volume = 1;
     this.rate = 1;
     this.playing = false;
+    this.resourceReady = false;
     this.wait = 1;
     this.settingsChangeCallback = () => {
     };
@@ -52687,7 +52688,7 @@ var MediaOverlayModule = class {
         console.log("ontimeupdate");
       this.trackCurrentTime();
     };
-    this.ensureOnTimeUpdate = (remove) => {
+    this.ensureOnTimeUpdate = (remove, replace) => {
       if (this.audioElement) {
         if (remove) {
           if (this.__ontimeupdate) {
@@ -52696,8 +52697,11 @@ var MediaOverlayModule = class {
             cancelAnimationFrame(this.myReq);
           }
         } else {
-          if (!this.__ontimeupdate) {
+          if (!this.__ontimeupdate || replace) {
             this.__ontimeupdate = true;
+            if (replace) {
+              this.audioElement.removeEventListener("timeupdate", this.ontimeupdate);
+            }
             this.audioElement.addEventListener("timeupdate", this.ontimeupdate);
           }
         }
@@ -52741,7 +52745,7 @@ var MediaOverlayModule = class {
   async playLink() {
     let link = this.currentLinks[this.currentLinkIndex];
     if (link?.Properties?.MediaOverlay) {
-      this.ensureOnTimeUpdate(false);
+      this.ensureOnTimeUpdate(false, false);
       const moUrl = link.Properties?.MediaOverlay;
       const moUrlObjFull = new URL(moUrl, this.publication.manifestUrl);
       const moUrlFull = moUrlObjFull.toString();
@@ -52781,6 +52785,7 @@ var MediaOverlayModule = class {
         await this.playLink();
       } else {
         if (this.settings.autoTurn && this.settings.playing) {
+          this.audioElement.pause();
           this.delegate.nextResource();
         } else {
           this.stopReadAloud();
@@ -52962,6 +52967,7 @@ var MediaOverlayModule = class {
         } else {
           this.audioElement.pause();
           if (this.settings.autoTurn && this.settings.playing) {
+            this.audioElement.pause();
             this.delegate.nextResource();
           } else {
             this.stopReadAloud();
@@ -52999,6 +53005,7 @@ var MediaOverlayModule = class {
       } else {
         this.audioElement.pause();
         if (this.settings.autoTurn && this.settings.playing) {
+          this.audioElement.pause();
           this.delegate.nextResource();
         } else {
           this.stopReadAloud();
@@ -53106,17 +53113,22 @@ var MediaOverlayModule = class {
           if (IS_DEV) {
             console.log("playMediaOverlaysAudio() - playClip() - _currentAudioElement.play()");
           }
-          this.ensureOnTimeUpdate(false);
+          this.ensureOnTimeUpdate(false, false);
           this.audioElement.playbackRate = this.settings.rate;
           this.audioElement.volume = this.settings.volume;
           if (this.settings.playing) {
-            if (!initial) {
-              setTimeout(async () => {
-                await this.audioElement.play();
-              }, this.settings.wait);
-            } else {
-              await this.audioElement.play();
-            }
+            let checkReady = function() {
+              if (!self2.settings.resourceReady) {
+                setTimeout(checkReady, 200);
+              } else {
+                setTimeout(async () => {
+                  await self2.audioElement.play();
+                  self2.ensureOnTimeUpdate(false, true);
+                }, self2.settings.wait * 1200);
+              }
+            };
+            let self2 = this;
+            checkReady();
           }
         } else {
           if (IS_DEV) {
@@ -53127,18 +53139,23 @@ var MediaOverlayModule = class {
             if (IS_DEV) {
               console.log("playMediaOverlaysAudio() - playClip() - ontimeupdateSeeked - .play()");
             }
-            this.ensureOnTimeUpdate(false);
+            this.ensureOnTimeUpdate(false, false);
             if (this.audioElement) {
               this.audioElement.playbackRate = this.settings.rate;
               this.audioElement.volume = this.settings.volume;
               if (this.settings.playing) {
-                if (!initial) {
-                  setTimeout(async () => {
-                    await this.audioElement.play();
-                  }, this.settings.wait);
-                } else {
-                  await this.audioElement.play();
-                }
+                let checkReady = function() {
+                  if (!self2.settings.resourceReady) {
+                    setTimeout(checkReady, 200);
+                  } else {
+                    setTimeout(async () => {
+                      await self2.audioElement.play();
+                      self2.ensureOnTimeUpdate(false, true);
+                    }, self2.settings.wait * 1200);
+                  }
+                };
+                let self2 = this;
+                checkReady();
               }
             }
           };
@@ -53147,7 +53164,7 @@ var MediaOverlayModule = class {
         }
       } else {
         const contiguous = this.previousAudioUrl === this.currentAudioUrl && typeof this.previousAudioEnd !== "undefined" && this.previousAudioEnd > timeToSeekTo - 0.02 && this.previousAudioEnd <= timeToSeekTo && this.audioElement.currentTime >= timeToSeekTo - 0.1;
-        this.ensureOnTimeUpdate(false);
+        this.ensureOnTimeUpdate(false, false);
         if (contiguous) {
           if (IS_DEV) {
             console.log("playMediaOverlaysAudio() - playClip() - ensureOnTimeUpdate");
@@ -53204,6 +53221,7 @@ var MediaOverlayModule = class {
           await this.playLink();
         } else {
           if (this.settings.autoTurn && this.settings.playing) {
+            this.audioElement.pause();
             this.delegate.nextResource();
           } else {
             this.stopReadAloud();
@@ -53795,18 +53813,25 @@ var ContentProtectionModule = class {
     }
   }
   recalculate(delay2 = 0) {
-    if (this.properties?.enableObfuscation) {
-      const onDoResize = (0, import_debounce3.debounce)(() => {
-        this.calcRects(this.rects);
-        if (this.rects !== void 0) {
-          this.rects.forEach((rect) => this.toggleRect(rect, this.securityContainer, this.isHacked));
+    return new Promise((resolve) => {
+      if (this.properties?.enableObfuscation) {
+        const onDoResize = (0, import_debounce3.debounce)(() => {
+          this.calcRects(this.rects);
+          if (this.rects !== void 0) {
+            this.rects.forEach((rect) => this.toggleRect(rect, this.securityContainer, this.isHacked));
+          }
+          resolve(true);
+        }, delay2);
+        if (this.rects) {
+          this.observe();
+          onDoResize();
+        } else {
+          resolve(false);
         }
-      }, delay2);
-      if (this.rects) {
-        this.observe();
-        onDoResize();
+      } else {
+        resolve(false);
       }
-    }
+    });
   }
   calcRects(rects) {
     if (rects !== void 0) {
@@ -56089,6 +56114,11 @@ var IFrameNavigator = class extends import_events.default {
           this.view?.goToProgression(bookViewPosition);
         }
         this.newPosition = void 0;
+        if (this.rights?.enableContentProtection) {
+          if (this.contentProtectionModule !== void 0) {
+            await this.contentProtectionModule.recalculate(10);
+          }
+        }
         this.hideLoadingMessage();
         this.showIframeContents();
         if (this.rights.enableMediaOverlays && this.mediaOverlayModule !== void 0 && this.hasMediaOverlays) {
@@ -56097,6 +56127,11 @@ var IFrameNavigator = class extends import_events.default {
         }
         await this.updatePositionInfo();
         await this.view?.setSize();
+        setTimeout(() => {
+          if (this.mediaOverlayModule !== void 0) {
+            this.mediaOverlayModule.settings.resourceReady = true;
+          }
+        }, 300);
       }, 200);
       return new Promise((resolve) => resolve());
     } catch (err) {
@@ -57401,6 +57436,9 @@ var IFrameNavigator = class extends import_events.default {
       this.loadingMessage.style.display = "block";
       this.loadingMessage.classList.add("is-loading");
     }
+    if (this.mediaOverlayModule !== void 0) {
+      this.mediaOverlayModule.settings.resourceReady = false;
+    }
   }
   hideIframeContents() {
     this.isBeingStyled = true;