Merge pull request #25 from d-i-t-a/fixes/last-navigated-to

Fixes last navigated to

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d-i-t-a/reader",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "A viewer application for EPUB files.",
   "repository": "https://github.com/d-i-t-a/R2D2BC",
   "main": "src/index.js",

src/index.ts

@@ -59,9 +59,9 @@ export function currentResource() {
     if (IS_DEV) { console.log("currentResource") }
     return R2Navigator.currentResource()    
 }
-export function currentTocHref() {
-    if (IS_DEV) { console.log("currentTocHref") }
-    return R2Navigator.currentTocHref()    
+export function mostRecentNavigatedTocItem() {
+    if (IS_DEV) { console.log("mostRecentNavigatedTocItem") }
+    return R2Navigator.mostRecentNavigatedTocItem()    
 }
 export function totalResources() {
     if (IS_DEV) { console.log("totalResources") }
@@ -266,8 +266,8 @@ exports.annotations = function () {
 exports.currentResource = function() {
     return currentResource()
 }
-exports.currentTocHref = function() {
-    return currentTocHref()
+exports.mostRecentNavigatedTocItem = function() {
+    return mostRecentNavigatedTocItem()
 }
 exports.totalResources = function() {
     return totalResources()

src/model/Publication.ts

@@ -152,6 +152,11 @@ export default class Publication {
     public getAbsoluteHref(href: string): string | null {
         return new URL(href, this.manifestUrl.href).href;
     }
+    public getRelativeHref(href: string): string | null {
+        const manifest = this.manifestUrl.href.replace("/manifest.json", ""); //new URL(this.manifestUrl.href, this.manifestUrl.href).href;
+        return href.replace(manifest, "");
+    }
+
 
     public getTOCItemAbsolute(href: string): Link | null {
         const absolute = this.getAbsoluteHref(href)

src/navigator/IFrameNavigator.ts

@@ -1000,8 +1000,8 @@ export default class IFrameNavigator implements Navigator {
     totalResources(): number {
         return this.publication.readingOrder.length
     }
-    currentTocHref(): string {
-        return this.currentTOCRawLink
+    mostRecentNavigatedTocItem(): string {
+        return this.publication.getRelativeHref(this.currentTOCRawLink) 
     }
     currentResource(): number {
         let currentLocation = this.currentChapterLink.href

viewer/index_api.html

@@ -36,7 +36,7 @@
 
         <button onclick="javascript:alert(D2Reader.totalResources())">totalResources</button><br>
         <button onclick="javascript:alert(D2Reader.currentResource())">currentResource</button><br>
-        <button onclick="javascript:alert(D2Reader.currentTocHref())">currentTocHref</button><br>
+        <button onclick="javascript:alert(D2Reader.mostRecentNavigatedTocItem())">mostRecentNavigatedTocItem</button><br>
 
         <button onclick="javascript:D2Reader.resetUserSettings()">reset user setting</button><br>
         <button onclick="javascript:D2Reader.publisher(true)">publisher default</button><br>