From 230777d119c2d02a9a56b3b881dff99edafe68d1 Mon Sep 17 00:00:00 2001
From: Amelia <77553571+Fesaa@users.noreply.github.com>
Date: Sun, 1 Jun 2025 18:00:19 +0200
Subject: [PATCH] Revert, and only keep the off by one fix & new prompt
---
.../book-reader/book-reader.component.html | 40 ++++++++-----------
.../book-reader/book-reader.component.ts | 31 --------------
UI/Web/src/assets/langs/en.json | 12 ++----
3 files changed, 20 insertions(+), 63 deletions(-)
diff --git a/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.html b/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.html
index 22cd086e7..fb741d4a1 100644
--- a/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.html
+++ b/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.html
@@ -20,44 +20,38 @@
diff --git a/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.ts b/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.ts
index 05763e74a..4d2f5eae3 100644
--- a/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.ts
+++ b/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.ts
@@ -918,18 +918,6 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
return goToPageNum;
}
- async promptForSection() {
- const [_, totalVirtualPages, _2] = this.getVirtualPage();
- const promptConfig = {...this.confirmService.defaultPrompt};
- promptConfig.header = translate('book-reader.go-to-section');
- promptConfig.content = translate('book-reader.go-to-section-prompt', {totalSections: totalVirtualPages});
-
- const goToPageNum = await this.confirmService.prompt(undefined, promptConfig);
- if (goToPageNum === null || goToPageNum.trim().length === 0 || !/^[0-9]+$/.test(goToPageNum)) { return null; }
-
- return Math.min(Math.max(parseInt(goToPageNum, 10), 0), totalVirtualPages - 1) + '';
- }
-
async goToPage(pageNum?: number) {
let page = pageNum;
if (pageNum === null || pageNum === undefined) {
@@ -951,25 +939,6 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
this.loadPage();
}
- async loadSection(sectionNum?: number) {
- let section = sectionNum;
- if (sectionNum === null || sectionNum === undefined) {
- const goToPageNum = await this.promptForSection();
- if (goToPageNum === null) { return; }
- section = parseInt(goToPageNum.trim(), 10);
- }
-
- if (section === undefined || this.pageNum === section) { return; }
-
- if (section > this.maxPages - 1) {
- section = this.maxPages - 1;
- } else if (section < 0) {
- section = 0;
- }
-
- // HACK
- }
-
diff --git a/UI/Web/src/assets/langs/en.json b/UI/Web/src/assets/langs/en.json
index aa88fcbcf..df2036e0e 100644
--- a/UI/Web/src/assets/langs/en.json
+++ b/UI/Web/src/assets/langs/en.json
@@ -858,10 +858,9 @@
"book-reader": {
"title": "Book Settings",
- "section-label": "Section",
- "section-tooltip": "A virtual page when using Column mode",
+ "page-label": "Page",
- "pagination-header": "Page",
+ "pagination-header": "Section",
"go-to-page": "Go to page",
"go-to-first-page": "Go to first page",
"go-to-last-page": "Go to last page",
@@ -871,10 +870,6 @@
"next-chapter": "Next Chapter/Volume",
"skip-header": "Skip to main content",
"virtual-pages": "virtual pages",
- "next-section": "Next section",
- "prev-section": "Prev section",
- "go-to-section": "Go to section",
- "go-to-last-section": "Go to last section",
"settings-header": "Settings",
"table-of-contents-header": "Table of Contents",
@@ -888,8 +883,7 @@
"incognito-mode-label": "Incognito Mode",
"next": "Next",
"previous": "Previous",
- "go-to-page-prompt": "There are {{totalPages}} pages. What page do you want to go to?",
- "go-to-section-prompt": "There are {{totalSections}} sections. What section do you want to go to?"
+ "go-to-page-prompt": "There are {{totalPages}} sections. What section do you want to go to?"
},
"personal-table-of-contents": {