diff --git a/injectables/style/popup.css b/injectables/style/popup.css index 94143660..5b205946 100644 --- a/injectables/style/popup.css +++ b/injectables/style/popup.css @@ -102,7 +102,7 @@ margin: 0; background-color: #fafafa; border-radius: 0.5em; - line-height: 0; + /*line-height: 1;*/ max-width: 353px; } .d2-popup-content { @@ -117,5 +117,5 @@ background: #fafafa; border-radius: 0.5em; -webkit-font-smoothing: subpixel-antialiased; - line-height: normal; + line-height: normal !important; } diff --git a/src/model/Locator.ts b/src/model/Locator.ts index 8ce1db8e..e39a9c06 100644 --- a/src/model/Locator.ts +++ b/src/model/Locator.ts @@ -64,8 +64,3 @@ export interface Annotation extends Locator { created: Date; highlight?: IHighlight; } - -export interface ChapterWeight { - chapterHref: string; - weight: number; -} diff --git a/src/modules/search/SearchModule.ts b/src/modules/search/SearchModule.ts index fda08d82..a03464aa 100644 --- a/src/modules/search/SearchModule.ts +++ b/src/modules/search/SearchModule.ts @@ -19,10 +19,7 @@ import * as HTMLUtilities from "../../utils/HTMLUtilities"; import { Publication } from "../../model/Publication"; -import { - IFrameNavigator, - RequestConfig, -} from "../../navigator/IFrameNavigator"; +import { IFrameNavigator } from "../../navigator/IFrameNavigator"; import { ReaderModule } from "../ReaderModule"; import { addEventListenerOptional, @@ -50,7 +47,6 @@ export interface SearchModuleConfig extends SearchModuleProperties { publication: Publication; headerMenu?: HTMLElement | null; delegate: IFrameNavigator; - requestConfig?: RequestConfig; highlighter: TextHighlighter; } @@ -67,7 +63,6 @@ export class SearchModule implements ReaderModule { private bookSearchResult: any = []; private currentSearchHighlights: any = []; private highlighter?: TextHighlighter; - private requestConfig?: RequestConfig; public static async create(config: SearchModuleConfig) { const search = new this( @@ -75,7 +70,6 @@ export class SearchModule implements ReaderModule { config.publication, config as SearchModuleProperties, config.highlighter, - config.requestConfig, config.api, config.headerMenu ); @@ -89,7 +83,6 @@ export class SearchModule implements ReaderModule { publication: Publication, properties: SearchModuleProperties, highlighter: TextHighlighter, - requestConfig?: RequestConfig, api?: SearchModuleAPI, headerMenu?: HTMLElement | null ) { @@ -99,7 +92,6 @@ export class SearchModule implements ReaderModule { this.properties = properties; this.api = api; this.highlighter = highlighter; - this.requestConfig = requestConfig; } async stop() { @@ -725,13 +717,15 @@ export class SearchModule implements ReaderModule { } if (tocItem) { let href = this.publication.getAbsoluteHref(tocItem.Href); - await fetch(href, this.requestConfig) + await fetch(href, this.delegate.requestConfig) .then((r) => r.text()) .then(async (data) => { // ({ data, tocItem }); let parser = new DOMParser(); let doc = parser.parseFromString( - this.requestConfig?.encoded ? this.decodeBase64(data) : data, + this.delegate.requestConfig?.encoded + ? this.decodeBase64(data) + : data, "application/xhtml+xml" ); if (tocItem) { @@ -776,13 +770,15 @@ export class SearchModule implements ReaderModule { } if (tocItem) { let href = this.publication.getAbsoluteHref(tocItem.Href); - await fetch(href, this.requestConfig) + await fetch(href, this.delegate.requestConfig) .then((r) => r.text()) .then(async (data) => { // ({ data, tocItem }); let parser = new DOMParser(); let doc = parser.parseFromString( - this.requestConfig?.encoded ? this.decodeBase64(data) : data, + this.delegate.requestConfig?.encoded + ? this.decodeBase64(data) + : data, "application/xhtml+xml" ); if (tocItem) { diff --git a/src/navigator/IFrameNavigator.ts b/src/navigator/IFrameNavigator.ts index be24edfe..57ad4e65 100644 --- a/src/navigator/IFrameNavigator.ts +++ b/src/navigator/IFrameNavigator.ts @@ -323,7 +323,8 @@ export class IFrameNavigator extends EventEmitter implements Navigator { config.injectables, config.attributes || { margin: 0 }, config.services, - config.sample + config.sample, + config.requestConfig ); await navigator.start( diff --git a/src/reader.ts b/src/reader.ts index fc2974e1..55222e0e 100644 --- a/src/reader.ts +++ b/src/reader.ts @@ -287,7 +287,6 @@ export default class D2Reader { delegate: navigator, publication: publication, highlighter: highlighter, - requestConfig: initialConfig.requestConfig, ...initialConfig.search, }) : undefined;