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

v1.3.3 several fixes
d-i-t-a · Nov 19, 2020 · 54dd992 · 54dd992
2 parents 3960c28 + bd7a94f
commit 54dd992
Show file tree

Hide file tree

Showing 8 changed files with 152 additions and 148 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": "1.3.2",
+ "version": "1.3.3",
  "description": "A viewer application for EPUB files.",
  "repository": "https://github.com/d-i-t-a/R2D2BC",
  "license": "Apache-2.0",

diff --git a/src/index.ts b/src/index.ts
@@ -266,7 +266,8 @@ export async function load(config: ReaderConfig): Promise<any> {
  tts: config.tts,
  injectables: config.injectables,
  selectionMenuItems: config.selectionMenuItems,
- initialAnnotationColor: config.initialAnnotationColor
+ initialAnnotationColor: config.initialAnnotationColor,
+ attributes: config.attributes
  })
 
  // Bookmark Module

diff --git a/src/modules/AnnotationModule.ts b/src/modules/AnnotationModule.ts
@@ -212,8 +212,6 @@ export default class AnnotationModule implements ReaderModule {
  tocItem = this.publication.getTOCItemAbsolute(this.delegate.currentChapterLink.href);
  }
 
- const url = this.publication.getAbsoluteHref(tocItem.href);
-
  const bookmarkPosition = this.delegate.reflowable.getCurrentPosition();
 
  const body = HTMLUtilities.findRequiredIframeElement(this.delegate.iframe.contentDocument, "body") as HTMLBodyElement;
@@ -222,7 +220,7 @@ export default class AnnotationModule implements ReaderModule {
 
  const annotation: Annotation = {
  id: id,
- href: url,
+ href: tocItem.href,
  locations: {
  progression: progression
  },
@@ -308,9 +306,7 @@ export default class AnnotationModule implements ReaderModule {
  tocItem = this.publication.getTOCItemAbsolute(this.delegate.currentChapterLink.href);
  }
 
- const url = this.publication.getAbsoluteHref(tocItem.href);
-
- if (annotation.href === url) {
+ if (annotation.href === tocItem.href) {
 
  this.highlighter.setColor(annotation.color);
 
@@ -350,9 +346,7 @@ export default class AnnotationModule implements ReaderModule {
  tocItem = this.publication.getTOCItemAbsolute(this.delegate.currentChapterLink.href);
  }
 
- const url = this.publication.getAbsoluteHref(tocItem.href);
-
- if (annotation.href === url) {
+ if (annotation.href === tocItem.href) {
 
  this.highlighter.setColor(annotation.color);