diff --git a/package-lock.json b/package-lock.json index b9237c4e..a57afd0e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@d-i-t-a/reader", - "version": "2.1.0-beta.4", + "version": "2.1.0-beta.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@d-i-t-a/reader", - "version": "2.1.0-beta.4", + "version": "2.1.0-beta.5", "license": "Apache-2.0", "dependencies": { "@types/sass": "^1.43.1", diff --git a/package.json b/package.json index 128e7cc1..5e9500c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@d-i-t-a/reader", - "version": "2.1.0-beta.4", + "version": "2.1.0-beta.5", "description": "A viewer application for EPUB files.", "repository": "https://github.com/d-i-t-a/R2D2BC", "license": "Apache-2.0", diff --git a/src/navigator/IFrameNavigator.ts b/src/navigator/IFrameNavigator.ts index dd36f004..ad956df0 100644 --- a/src/navigator/IFrameNavigator.ts +++ b/src/navigator/IFrameNavigator.ts @@ -26,11 +26,7 @@ import EventHandler, { } from "../utils/EventHandler"; import * as BrowserUtilities from "../utils/BrowserUtilities"; import * as HTMLUtilities from "../utils/HTMLUtilities"; -import { - readerError, - readerLoading, - simpleUpLinkTemplate, -} from "../utils/HTMLTemplates"; +import { readerError, readerLoading } from "../utils/HTMLTemplates"; import { Annotation, Locations, @@ -118,11 +114,6 @@ export interface NavigatorAPI { onError?: (e: Error) => void; } -export interface UpLinkConfig { - url?: URL; - label?: string; - ariaLabel?: string; -} export interface IFrameAttributes { margin: number; navHeight?: number; @@ -137,7 +128,6 @@ export interface IFrameNavigatorConfig { publication: Publication; settings: UserSettings; annotator?: Annotator; - upLink?: UpLinkConfig; initialLastReadingPosition?: ReadingPosition; rights: Partial; api?: Partial; @@ -196,7 +186,6 @@ export interface ReaderConfig { userSettings?: any; initialAnnotations?: any; lastReadingPosition?: any; - upLinkUrl?: any; rights?: Partial; api?: Partial; tts?: Partial; @@ -258,8 +247,6 @@ export class IFrameNavigator extends EventEmitter implements Navigator { private readonly touchEventHandler: TouchEventHandler; private readonly keyboardEventHandler: KeyboardEventHandler; private readonly sampleReadEventHandler: SampleReadEventHandler; - private readonly upLinkConfig: UpLinkConfig | undefined; - private upLink: HTMLAnchorElement | undefined = undefined; private nextChapterBottomAnchorElement: HTMLAnchorElement; private previousChapterTopAnchorElement: HTMLAnchorElement; @@ -326,7 +313,6 @@ export class IFrameNavigator extends EventEmitter implements Navigator { const navigator = new this( config.settings, config.annotator || undefined, - config.upLink || undefined, config.initialLastReadingPosition || undefined, config.publication, config.api, @@ -349,7 +335,6 @@ export class IFrameNavigator extends EventEmitter implements Navigator { protected constructor( settings: UserSettings, annotator: Annotator | undefined = undefined, - upLinkConfig: UpLinkConfig | undefined = undefined, initialLastReadingPosition: ReadingPosition | undefined = undefined, publication: Publication, api?: Partial, @@ -370,7 +355,6 @@ export class IFrameNavigator extends EventEmitter implements Navigator { this.eventHandler = new EventHandler(this); this.touchEventHandler = new TouchEventHandler(this); this.keyboardEventHandler = new KeyboardEventHandler(this); - this.upLinkConfig = upLinkConfig; this.initialLastReadingPosition = initialLastReadingPosition; this.publication = publication; this.api = api; @@ -1241,36 +1225,6 @@ export class IFrameNavigator extends EventEmitter implements Navigator { } } - if ( - (this.links || this.linksTopLeft) && - this.upLinkConfig && - this.upLinkConfig.url - ) { - const upUrl = this.upLinkConfig.url; - const upLabel = this.upLinkConfig.label || ""; - const upAriaLabel = this.upLinkConfig.ariaLabel || upLabel; - var upHTML = simpleUpLinkTemplate(upUrl.href, upLabel, upAriaLabel); - const upParent: HTMLLIElement = document.createElement("li"); - upParent.classList.add("uplink-wrapper"); - upParent.innerHTML = upHTML; - if (this.links) { - this.links.insertBefore(upParent, this.links.firstChild); - this.upLink = HTMLUtilities.findRequiredElement( - this.links, - "a[rel=up]" - ); - } else { - this.linksTopLeft.insertBefore( - upParent, - this.linksTopLeft.firstChild - ); - this.upLink = HTMLUtilities.findRequiredElement( - this.linksTopLeft, - "a[rel=up]" - ); - } - } - let lastReadingPosition: ReadingPosition | undefined = undefined; if (this.annotator) { lastReadingPosition = (await this.annotator.getLastReadingPosition()) as diff --git a/src/reader.ts b/src/reader.ts index beccaeeb..fc2974e1 100644 --- a/src/reader.ts +++ b/src/reader.ts @@ -41,7 +41,6 @@ import { IFrameNavigator, IFrameAttributes, ReaderConfig, - UpLinkConfig, ReaderRights, } from "./navigator/IFrameNavigator"; import LocalAnnotator from "./store/LocalAnnotator"; @@ -158,8 +157,6 @@ export default class D2Reader { const annotator = new LocalAnnotator({ store: store }); - const upLink: UpLinkConfig = initialConfig.upLinkUrl ?? undefined; - publication.sample = initialConfig.sample; // update our config based on what we know from the publication @@ -212,7 +209,6 @@ export default class D2Reader { publication: publication, settings, annotator: annotator, - upLink: upLink, initialLastReadingPosition: initialConfig.lastReadingPosition, api: initialConfig.api, rights: rights, diff --git a/src/utils/HTMLTemplates.ts b/src/utils/HTMLTemplates.ts index 9706191d..432b5cb3 100644 --- a/src/utils/HTMLTemplates.ts +++ b/src/utils/HTMLTemplates.ts @@ -19,28 +19,6 @@ import * as IconLib from "./IconLib"; -export const simpleUpLinkTemplate = ( - href: string, - _label: string, - ariaLabel: string -) => ` -arrow_back_ios -`; - -export const defaultUpLinkTemplate = ( - href: string, - label: string, - ariaLabel: string -) => ` - - - ${label} - ${IconLib.icons.home} - -${label} - -`; - export const readerLoading = `${IconLib.icons.loading}`; export const readerError = ` diff --git a/viewer/index_api.html b/viewer/index_api.html index 78c56160..df6ea3e9 100644 --- a/viewer/index_api.html +++ b/viewer/index_api.html @@ -458,7 +458,6 @@ ] let urlParams = getURLQueryParams(); - let upLink = { url: new URL("/", window.location.href), label: "Back", ariaLabel: "Go back" }; let d2reader = undefined; D2Reader.load({ diff --git a/viewer/index_dita.html b/viewer/index_dita.html index 05c7304f..943a9920 100644 --- a/viewer/index_dita.html +++ b/viewer/index_dita.html @@ -743,7 +743,6 @@ return params; }; let urlParams = getURLQueryParams(); - let upLink = { url: new URL("/", window.location.href), label: "Back", ariaLabel: "Go back" }; let injectables = [ { type: 'style', url: '/viewer/readium-css/ReadiumCSS-before.css', r2before: true }, { type: 'style', url: '/viewer/readium-css/ReadiumCSS-default.css', r2default: true }, @@ -967,7 +966,6 @@ let d2reader; D2Reader.load({ - upLinkUrl: upLink, url: new URL(urlParams['url']), requestConfig: { method: "GET", diff --git a/viewer/index_sampleread.html b/viewer/index_sampleread.html index b7001e0b..068ae4ed 100644 --- a/viewer/index_sampleread.html +++ b/viewer/index_sampleread.html @@ -236,7 +236,6 @@ return params; }; let urlParams = getURLQueryParams(); - let upLink = { url: new URL("/", window.location.href), label: "Back", ariaLabel: "Go back" }; let injectables = [ { type: 'style', url: '/viewer/readium-css/ReadiumCSS-before.css', r2before: true }, { type: 'style', url: '/viewer/readium-css/ReadiumCSS-default.css', r2default: true }, @@ -269,7 +268,6 @@ let d2reader; D2Reader.load({ - upLinkUrl: upLink, url: new URL(urlParams['url']), attributes: { margin: 120,