diff --git a/src/epub/epub.js b/src/epub/epub.js index 2be9ae8..a8e088b 100644 --- a/src/epub/epub.js +++ b/src/epub/epub.js @@ -109,7 +109,7 @@ class Epub extends Publication { this.landmarksUrl = navUrl; } - if (pagelist.pages && pagelist.pages.length) { + if (pagelist.pageList && pagelist.pageList.length) { this.pagelistUrl = navUrl; } @@ -120,7 +120,7 @@ class Epub extends Publication { return { toc: navigation.toc, landmarks: navigation.landmarks, - pageList: pagelist.pages, + pageList: pagelist.pageList, locations: pagelist.locations } } @@ -180,6 +180,7 @@ class Epub extends Publication { const { toc, landmarks, pageList, locations } = await this.loadNavigation(packaging); this.toc = toc; this.landmarks = landmarks; + console.log("pageList", pageList); this.pagelist = pageList; this.locations = locations; diff --git a/src/epub/pagelist.js b/src/epub/pagelist.js index e9dd701..52320ae 100644 --- a/src/epub/pagelist.js +++ b/src/epub/pagelist.js @@ -124,7 +124,7 @@ class PageList { var content = qs(item, "a"), href = content.getAttribute("href") || "", text = content.textContent || "", - page = parseInt(text), + page = text, isCfi = href.indexOf("epubcfi"), split, packageUrl, diff --git a/src/manifest/manifest.js b/src/manifest/manifest.js index 0ad75a0..63178f3 100644 --- a/src/manifest/manifest.js +++ b/src/manifest/manifest.js @@ -13,6 +13,10 @@ class Manifest extends Publication { constructor(url, options) { super(); + this.settings = Object.assign({ + url: undefined + }, options) + if (url) { this.opened = this.open(url); } @@ -69,7 +73,7 @@ class Manifest extends Publication { } async open(url) { - this.url = url; + this.url = this.settings.url ? this.settings.url : url; const manifest = await this.load(url, "json"); diff --git a/src/publication/publication.js b/src/publication/publication.js index f66b1e9..51e19be 100644 --- a/src/publication/publication.js +++ b/src/publication/publication.js @@ -341,6 +341,7 @@ class Publication { } for (const item of items) { + console.log("ITEM", item) item.url = this.resolve(item.url || item.href); item.canonical = item.canonical || item.url; diff --git a/src/utils/locations.js b/src/utils/locations.js index 1100fa1..5ace7e6 100644 --- a/src/utils/locations.js +++ b/src/utils/locations.js @@ -40,7 +40,7 @@ function createRange() { async function process(section, chars, requestMethod, pause) { let contents = await requestMethod(section.url); - let locations = parse(contents, section.cfiBase); + let locations = parse(contents, section.cfiBase, chars); return locations; }