Merge pull request #33 from d-i-t-a/fixes/next-previous

fixed next/previous page
d-i-t-a · May 15, 2020 · 74d0ce7 · 74d0ce7
2 parents a143184 + 1c8ec88
commit 74d0ce7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 34 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.1.1",
+  "version": "1.1.2",
   "description": "A viewer application for EPUB files.",
   "repository": "https://github.com/d-i-t-a/R2D2BC",
   "main": "src/index.js",

diff --git a/src/navigator/IFrameNavigator.ts b/src/navigator/IFrameNavigator.ts
@@ -1084,7 +1084,7 @@ export default class IFrameNavigator implements Navigator {
                     const position: Locator = {
                         href: this.publication.getAbsoluteHref(this.previousChapterLink.href),
                         locations: {
-                            progression: 0
+                            progression: 1
                         },
                         type: this.previousChapterLink.type,
                         title: this.previousChapterLink.title

diff --git a/src/views/ScrollingBookView.ts b/src/views/ScrollingBookView.ts
@@ -122,7 +122,7 @@ export default class ScrollingBookView implements ContinuousBookView {
     }
 
     public atBottom(): boolean {
-        return (document.scrollingElement.scrollHeight - document.scrollingElement.scrollTop) === BrowserUtilities.getHeight();
+        return (Math.ceil(document.scrollingElement.scrollHeight - document.scrollingElement.scrollTop) - 1) <= BrowserUtilities.getHeight();
     }
 
     public atTop(): boolean {