AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Use correct naming in the section jumper Fixes #3819"

Browse source 
This reverts commit db0f1dae86.
This commit is contained in:
Joseph Milazzo 2025-06-01 07:39:45 -05:00
parent 6d44f13af7
commit 3d097fbc33
3 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.html
View file

@ -44,11 +44,11 @@
</div> </div>
<div class="d-flex align-items-center justify-content-between text-center row g-0"> <div class="d-flex align-items-center justify-content-between text-center row g-0">
<button class="btn btn-small btn-icon col-1" [disabled]="prevChapterDisabled" (click)="loadPrevChapter()" [title]="t('prev-chapter')"><i class="fa fa-fast-backward" aria-hidden="true"></i></button> <button class="btn btn-small btn-icon col-1" [disabled]="prevChapterDisabled" (click)="loadPrevChapter()" [title]="t('prev-chapter')"><i class="fa fa-fast-backward" aria-hidden="true"></i></button>
<div class="col-1" (click)="goToSection(0)">{{pageNum}}</div> <div class="col-1" (click)="goToPage(0)">{{pageNum}}</div>
<div class="col-8"> <div class="col-8">
<ngb-progressbar class="clickable" [title]="t('go-to-page')" (click)="goToSection()" type="primary" height="5px" [value]="pageNum" [max]="maxPages - 1"></ngb-progressbar> <ngb-progressbar class="clickable" [title]="t('go-to-page')" (click)="goToPage()" type="primary" height="5px" [value]="pageNum" [max]="maxPages - 1"></ngb-progressbar>
</div> </div>
<div class="col-1 btn-icon" (click)="goToSection(maxPages - 1)" [title]="t('go-to-last-page')">{{maxPages - 1}}</div> <div class="col-1 btn-icon" (click)="goToPage(maxPages - 1)" [title]="t('go-to-last-page')">{{maxPages - 1}}</div>
<button class="btn btn-small btn-icon col-1" [disabled]="nextChapterDisabled" (click)="loadNextChapter()" [title]="t('next-chapter')"><i class="fa fa-fast-forward" aria-hidden="true"></i></button> <button class="btn btn-small btn-icon col-1" [disabled]="nextChapterDisabled" (click)="loadNextChapter()" [title]="t('next-chapter')"><i class="fa fa-fast-forward" aria-hidden="true"></i></button>
</div> </div>
</div> </div>

18
UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.ts
View file

@ -748,7 +748,7 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
} else if (event.key === KEY_CODES.G) { } else if (event.key === KEY_CODES.G) {
this.goToSection(); this.goToPage();
} else if (event.key === KEY_CODES.F) { } else if (event.key === KEY_CODES.F) {
this.toggleFullscreen() this.toggleFullscreen()
} }
@ -905,29 +905,33 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
} }
promptForSection() { promptForPage() {
const question = translate('book-reader.go-to-section-prompt', {totalSections: this.maxPages - 1}); const question = translate('book-reader.go-to-page-prompt', {totalPages: this.maxPages - 1});
const goToPageNum = window.prompt(question, ''); const goToPageNum = window.prompt(question, '');
if (goToPageNum === null || goToPageNum.trim().length === 0) { return null; } if (goToPageNum === null || goToPageNum.trim().length === 0) { return null; }
return goToPageNum; return goToPageNum;
} }
goToSection(pageNum?: number) { goToPage(pageNum?: number) {
let page = pageNum; let page = pageNum;
if (pageNum === null || pageNum === undefined) { if (pageNum === null || pageNum === undefined) {
const goToPageNum = this.promptForSection(); const goToPageNum = this.promptForPage();
if (goToPageNum === null) { return; } if (goToPageNum === null) { return; }
page = parseInt(goToPageNum.trim(), 10); page = parseInt(goToPageNum.trim(), 10);
} }
if (page === undefined || this.pageNum === page) { return; } if (page === undefined || this.pageNum === page) { return; }
if (page > this.maxPages-1) { if (page > this.maxPages) {
page = this.maxPages-1; page = this.maxPages;
} else if (page < 0) { } else if (page < 0) {
page = 0; page = 0;
} }
if (!(page === 0 || page === this.maxPages - 1)) {
page -= 1;
}
this.pageNum = page; this.pageNum = page;
this.loadPage(); this.loadPage();
} }

2
UI/Web/src/assets/langs/en.json
View file

@ -882,7 +882,7 @@
"incognito-mode-label": "Incognito Mode", "incognito-mode-label": "Incognito Mode",
"next": "Next", "next": "Next",
"previous": "Previous", "previous": "Previous",
"go-to-section-prompt": "There are {{totalSections}} sections. What section do you want to go to?" "go-to-page-prompt": "There are {{totalPages}} pages. What page do you want to go to?"
}, },
"personal-table-of-contents": { "personal-table-of-contents": {