@d-i-t-a/reader 2.1.7 → 2.1.10

package/dist/esm/index.js

@@ -39506,17 +39506,7 @@ var TextHighlighter = class {
           toolbox.style.top = ev.clientY + (self2.delegate.attributes?.navHeight ?? 0) + "px";
           toolbox.style.left = ev.clientX + "px";
           if (getComputedStyle(toolbox).display === "none") {
-            let noteH = function() {
-              self2.delegate.annotationModule?.api?.addCommentToAnnotation(anno).then((result) => {
-                self2.delegate.annotationModule?.updateAnnotation(result).then(async () => {
-                  import_loglevel5.default.log("update highlight " + result.id);
-                  toolbox.style.display = "none";
-                  self2.selectionMenuClosed();
-                });
-                toolbox.style.display = "none";
-                self2.selectionMenuClosed();
-              });
-            }, deleteH = function() {
+            let deleteH = function() {
               if (self2.delegate.rights.enableAnnotations) {
                 self2.delegate.annotationModule?.deleteSelectedHighlight(anno).then(async () => {
                   import_loglevel5.default.log("delete highlight " + anno.id);
@@ -39551,14 +39541,6 @@ var TextHighlighter = class {
             }
             if (commentIcon) {
               commentIcon.style.display = "none";
-              let clone = commentIcon.cloneNode(true);
-              let parent = commentIcon.parentElement;
-              clone.style.display = "unset";
-              clone.id = "cloneCommentIcon";
-              clone.addEventListener("click", noteH, false);
-              if (parent) {
-                parent.append(clone);
-              }
             }
             let deleteIcon = document.getElementById("deleteIcon");
             let cloneDeleteIcon = document.getElementById("cloneDeleteIcon");
@@ -42266,6 +42248,9 @@ var ContentProtectionModule = class {
     return true;
   }
   restrictCopy(event) {
+    if (this.citation) {
+      return;
+    }
     import_loglevel13.default.log("copy action initiated");
     let win = this.delegate.iframes[0].contentWindow;
     if (win) {
@@ -48281,24 +48266,30 @@ var HistoryModule = class {
     addEventListenerOptional(this.historyBackAnchorElement, "click", this.handleHistoryBackClick.bind(this));
   }
   async handleHistoryForwardClick(event) {
+    await this.historyForward();
+    event.preventDefault();
+    event.stopPropagation();
+  }
+  async historyForward() {
     if (this.history.length > 0) {
       if (this.historyCurrentIndex + 1 < this.history.length) {
         this.historyCurrentIndex = this.historyCurrentIndex + 1;
         await this.delegate.navigate(this.history[this.historyCurrentIndex], false);
       }
     }
+  }
+  async handleHistoryBackClick(event) {
+    await this.historyBack();
     event.preventDefault();
     event.stopPropagation();
   }
-  async handleHistoryBackClick(event) {
+  async historyBack() {
     if (this.history.length > 0) {
       if (this.historyCurrentIndex > 0) {
         this.historyCurrentIndex = this.historyCurrentIndex - 1;
         await this.delegate.navigate(this.history[this.historyCurrentIndex], false);
       }
     }
-    event.preventDefault();
-    event.stopPropagation();
   }
 };
 
@@ -48332,9 +48323,12 @@ var CitationModule = class {
     return module;
   }
   async stop() {
-    import_loglevel23.default.log("Timeline module stop");
+    import_loglevel23.default.log("Citation module stop");
   }
   copyToClipboard(textToClipboard) {
+    if (this.delegate?.contentProtectionModule) {
+      this.delegate.contentProtectionModule.citation = true;
+    }
     let success = true;
     if (window.clipboardData) {
       window.clipboardData.setData("text/plain", textToClipboard);
@@ -48384,7 +48378,11 @@ var CitationModule = class {
           let chicagoString = "";
           let mlaString = "";
           let apaString = "";
-          if (self2.publication.Metadata.Author?.length > 0) {
+          if (self2.properties.author) {
+            apaString = apaString + self2.properties.author;
+            mlaString = mlaString + self2.properties.author;
+            chicagoString = chicagoString + self2.properties.author;
+          } else if (self2.publication.Metadata.Author?.length > 0) {
             let authorIndex = 0;
             if (authorIndex === 0) {
               if (self2.publication.Metadata.Author[0].Name) {
@@ -48405,11 +48403,18 @@ var CitationModule = class {
           let chicagoString = "";
           let mlaString = "";
           let apaString = "";
-          if (self2.publication.Metadata.Publisher && self2.publication.Metadata.Publisher[0].Name) {
+          if (self2.properties.publisher) {
+            mlaString = mlaString + self2.properties.publisher + ", ";
+            chicagoString = chicagoString + self2.properties.publisher + ", ";
+          } else if (self2.publication.Metadata.Publisher && self2.publication.Metadata.Publisher[0].Name) {
             mlaString = mlaString + self2.publication.Metadata.Publisher[0].Name + ", ";
             chicagoString = chicagoString + self2.publication.Metadata.Publisher[0].Name + ", ";
           }
-          if (self2.publication.Metadata.PublicationDate) {
+          if (self2.properties.published) {
+            apaString = apaString + "(" + self2.properties.published + ")";
+            mlaString = mlaString + self2.properties.published;
+            chicagoString = chicagoString + self2.properties.published;
+          } else if (self2.publication.Metadata.PublicationDate) {
             if (self2.publication.Metadata.PublicationDate.getFullYear() > 0) {
               apaString = apaString + "(" + self2.publication.Metadata.PublicationDate.getFullYear() + ")";
               mlaString = mlaString + self2.publication.Metadata.PublicationDate.getFullYear();
@@ -48422,7 +48427,13 @@ var CitationModule = class {
           return ["", "", ""];
         };
         let bookTitleFormatted = function() {
-          if (self2.publication.Metadata.Title) {
+          if (self2.properties.title) {
+            return [
+              self2.properties.title + ". ",
+              self2.properties.title + ". ",
+              self2.properties.title + ". "
+            ];
+          } else if (self2.publication.Metadata.Title) {
             return [
               self2.publication.Metadata.Title + ". ",
               self2.publication.Metadata.Title + ". ",
@@ -48439,7 +48450,11 @@ var CitationModule = class {
           let chicagoString = "";
           let mlaString = "";
           let apaString = "";
-          if (self2.publication.Metadata.Publisher && self2.publication.Metadata.Publisher[0].Name) {
+          if (self2.properties.publisher) {
+            mlaString = mlaString + self2.properties.publisher + ", ";
+            chicagoString = chicagoString + self2.properties.publisher + ", ";
+            apaString = apaString + self2.properties.publisher + ", ";
+          } else if (self2.publication.Metadata.Publisher && self2.publication.Metadata.Publisher[0].Name) {
             mlaString = mlaString + self2.publication.Metadata.Publisher[0].Name + ", ";
             chicagoString = chicagoString + self2.publication.Metadata.Publisher[0].Name + ", ";
             apaString = apaString + self2.publication.Metadata.Publisher[0].Name + ", ";
@@ -48600,6 +48615,12 @@ var D2Reader = class {
     this.addDefinition = async (definition) => {
       await this.definitionsModule?.addDefinition(definition);
     };
+    this.historyBack = async () => {
+      return this.historyModule?.historyBack();
+    };
+    this.historyForward = async () => {
+      return this.historyModule?.historyForward();
+    };
     this.search = async (term, current) => {
       return await this.searchModule?.search(term, current) ?? [];
     };
@@ -48864,6 +48885,11 @@ var D2Reader = class {
       publication,
       delegate: navigator2
     }) : void 0;
+    const citationModule = rights.enableCitations ? await CitationModule.create(__spreadValues({
+      publication,
+      delegate: navigator2,
+      highlighter
+    }, initialConfig.citations)) : void 0;
     const contentProtectionModule = rights.enableContentProtection ? await ContentProtectionModule.create(__spreadValues({
       delegate: navigator2
     }, initialConfig.protection)) : void 0;
@@ -48895,11 +48921,6 @@ var D2Reader = class {
       delegate: navigator2,
       headerMenu
     }) : void 0;
-    const citationModule = rights.enableCitations ? await CitationModule.create(__spreadValues({
-      publication,
-      delegate: navigator2,
-      highlighter
-    }, initialConfig.citations)) : void 0;
     return new D2Reader(settings, navigator2, highlighter, bookmarkModule, annotationModule, ttsSettings, ttsModule, searchModule, definitionsModule, contentProtectionModule, timelineModule, mediaOverlaySettings, mediaOverlayModule, pageBreakModule, lineFocusModule, historyModule, citationModule);
   }
   get hasMediaOverlays() {
@@ -48917,6 +48938,12 @@ var D2Reader = class {
   get annotations() {
     return this.annotationModule?.getAnnotations();
   }
+  get history() {
+    return this.historyModule?.history;
+  }
+  get historyCurrentIndex() {
+    return this.historyModule?.historyCurrentIndex;
+  }
   get currentResource() {
     return this.navigator.currentResource();
   }