@d-i-t-a/reader 2.3.3 → 2.3.4

package/dist/esm/index.js

@@ -48061,16 +48061,29 @@ var Popup = class {
         absolute = absolute.substring(0, absolute.indexOf("#"));
         event.preventDefault();
         event.stopPropagation();
-        await fetch(absolute, this.navigator.requestConfig).then((r) => r.text()).then(async (data) => {
-          const parser = new DOMParser();
-          const doc = parser.parseFromString(data, "text/html");
-          const element = doc.querySelector("#" + id2);
-          if (element) {
-            event.preventDefault();
-            event.stopPropagation();
-            this.showPopup(element, event);
-          }
-        });
+        if (this.navigator.api?.getContent) {
+          await this.navigator.api?.getContent(href).then((content) => {
+            const parser = new DOMParser();
+            const doc = parser.parseFromString(content, "text/html");
+            const element = doc.querySelector("#" + id2);
+            if (element) {
+              event.preventDefault();
+              event.stopPropagation();
+              this.showPopup(element, event);
+            }
+          });
+        } else {
+          await fetch(absolute, this.navigator.requestConfig).then((r) => r.text()).then(async (data) => {
+            const parser = new DOMParser();
+            const doc = parser.parseFromString(data, "text/html");
+            const element = doc.querySelector("#" + id2);
+            if (element) {
+              event.preventDefault();
+              event.stopPropagation();
+              this.showPopup(element, event);
+            }
+          });
+        }
       }
     }
   }
@@ -48111,13 +48124,23 @@ var Popup = class {
         const d2content = document.createElement("div");
         d2content.className = "d2-popover-content";
         d2wrapper.appendChild(d2content);
-        await fetch(absolute, this.navigator.requestConfig).then((r) => r.text()).then(async (data) => {
-          d2content.innerHTML = data;
-          let doc = this.navigator.iframes[0].contentDocument;
-          if (doc) {
-            doc.body.appendChild(d2popover);
-          }
-        });
+        if (this.navigator.api?.getContent) {
+          await this.navigator.api?.getContent(href).then((content) => {
+            d2content.innerHTML = content;
+            let doc = this.navigator.iframes[0].contentDocument;
+            if (doc) {
+              doc.body.appendChild(d2popover);
+            }
+          });
+        } else {
+          await fetch(absolute, this.navigator.requestConfig).then((r) => r.text()).then(async (data) => {
+            d2content.innerHTML = data;
+            let doc = this.navigator.iframes[0].contentDocument;
+            if (doc) {
+              doc.body.appendChild(d2popover);
+            }
+          });
+        }
         let win = this.navigator.iframes[0].contentWindow;
         if (!win) {
           return;
@@ -58910,16 +58933,14 @@ var HistoryModule = class {
     let lastInHistory;
     if (history && this.annotator) {
       let lastReadingPosition = await this.annotator.getLastReadingPosition();
-      if (lastReadingPosition && lastReadingPosition?.locations.progression && lastReadingPosition?.locations.progression > 0) {
+      if (lastReadingPosition) {
+        const linkHref = this.publication.getAbsoluteHref(lastReadingPosition.href);
+        lastReadingPosition.href = linkHref;
         if (this.historyCurrentIndex < this.history.length - 1) {
           this.history = this.history.slice(0, this.historyCurrentIndex);
-        }
-        lastInHistory = this.history[this.history.length - 1];
-        if (lastInHistory && lastInHistory.href !== lastReadingPosition.href || lastInHistory === void 0) {
-          const linkHref = this.publication.getAbsoluteHref(lastReadingPosition.href);
-          import_loglevel21.default.log(lastReadingPosition.href);
-          import_loglevel21.default.log(linkHref);
-          lastReadingPosition.href = linkHref;
+          this.history.push(lastReadingPosition);
+          this.historyCurrentIndex = this.history.length - 1;
+        } else if (lastReadingPosition?.locations.progression && lastReadingPosition?.locations.progression > 0) {
           this.history.push(lastReadingPosition);
           this.historyCurrentIndex = this.history.length - 1;
         }