Merge pull request #390 from d-i-t-a/develop

V2.1.1
d-i-t-a · Sep 29, 2022 · ec73f65 · ec73f65
2 parents dc2c3f6 + 619a454
commit ec73f65
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@d-i-t-a/reader",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "A viewer application for EPUB files.",
   "repository": "https://github.com/d-i-t-a/R2D2BC",
   "license": "Apache-2.0",

diff --git a/src/modules/pagebreak/PageBreakModule.ts b/src/modules/pagebreak/PageBreakModule.ts
@@ -171,6 +171,9 @@ export class PageBreakModule implements ReaderModule {
     setTimeout(() => {
       const body = this.delegate.iframes[0].contentDocument?.body;
       let pageBreaks = body?.querySelectorAll('[*|type="pagebreak"]');
+      if (pageBreaks?.length === 0) {
+        pageBreaks = body?.querySelectorAll("[epub\\:type='pagebreak']");
+      }
       let self = this;
 
       function getCssSelector(element: Element): string {

diff --git a/src/navigator/IFrameNavigator.ts b/src/navigator/IFrameNavigator.ts
@@ -1527,10 +1527,13 @@ export class IFrameNavigator extends EventEmitter implements Navigator {
     for (const iframe of this.iframes) {
       const head = iframe.contentDocument?.head;
       if (head) {
-        head.insertBefore(
-          IFrameNavigator.createBase(this.currentChapterLink.href),
-          head.firstChild
-        );
+        const bases = iframe.contentDocument.getElementsByTagName("base");
+        if (bases.length === 0) {
+          head.insertBefore(
+            IFrameNavigator.createBase(this.currentChapterLink.href),
+            head.firstChild
+          );
+        }
 
         this.injectables?.forEach((injectable) => {
           if (injectable.type === "style") {
@@ -1622,10 +1625,13 @@ export class IFrameNavigator extends EventEmitter implements Navigator {
       const parser = new DOMParser();
       const doc = parser.parseFromString(content, "application/xhtml+xml");
       if (doc.head) {
-        doc.head.insertBefore(
-          IFrameNavigator.createBase(href),
-          doc.head.firstChild
-        );
+        const bases = doc.getElementsByTagName("base");
+        if (bases.length === 0) {
+          doc.head.insertBefore(
+            IFrameNavigator.createBase(href),
+            doc.head.firstChild
+          );
+        }
       }
       const newHTML = doc.documentElement.outerHTML;
       const iframeDoc = self.iframes[0].contentDocument;
@@ -1640,10 +1646,13 @@ export class IFrameNavigator extends EventEmitter implements Navigator {
       const parser = new DOMParser();
       const doc = parser.parseFromString(content, "application/xhtml+xml");
       if (doc.head) {
-        doc.head.insertBefore(
-          IFrameNavigator.createBase(href),
-          doc.head.firstChild
-        );
+        const bases = doc.getElementsByTagName("base");
+        if (bases.length === 0) {
+          doc.head.insertBefore(
+            IFrameNavigator.createBase(href),
+            doc.head.firstChild
+          );
+        }
       }
       const newHTML = doc.documentElement.outerHTML;
       const iframeDoc = self.iframes[1].contentDocument;