From 85506a156e0385cfc21a045c7a3c4bdc617e8e5d Mon Sep 17 00:00:00 2001 From: Aferdita Muriqi Date: Fri, 15 May 2020 09:56:06 -0400 Subject: [PATCH 1/2] fixed next/previous page --- src/navigator/IFrameNavigator.ts | 2 +- src/views/ScrollingBookView.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/navigator/IFrameNavigator.ts b/src/navigator/IFrameNavigator.ts index 693208ad..16e74e78 100644 --- 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 index 723b0c77..38d3b967 100644 --- 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 { From 1c8ec88aea21d9cda97a0ab4bf656ed9fdbd5b2d Mon Sep 17 00:00:00 2001 From: Aferdita Muriqi Date: Fri, 15 May 2020 09:59:17 -0400 Subject: [PATCH 2/2] version bump --- package-lock.json | 43 ++++++++++++------------------------------- package.json | 2 +- 2 files changed, 13 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index ac6e8482..9f96c696 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@d-i-t-a/reader", - "version": "1.1.1", + "version": "1.1.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2494,8 +2494,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -2516,14 +2515,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2538,20 +2535,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -2668,8 +2662,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -2681,7 +2674,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2696,7 +2688,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2704,14 +2695,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2730,7 +2719,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -2818,8 +2806,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -2831,7 +2818,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -2917,8 +2903,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -2954,7 +2939,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2974,7 +2958,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3018,14 +3001,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, diff --git a/package.json b/package.json index 85eb8e6a..428ff388 100644 --- 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",