Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-07-09 03:04:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug where loading page on book reader wouldn't scroll to last position (#907)

Browse Source
This commit is contained in:
Joseph Milazzo 2022-01-07 07:42:22 -08:00 committed by GitHub
parent 6afbf5f08f
commit 426cb7f0be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UI/Web/src/app/book-reader/book-reader/book-reader.component.ts
View File

@ -301,8 +301,6 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
.pipe(debounceTime(200), takeUntil(this.onDestroy)).subscribe((event) => { .pipe(debounceTime(200), takeUntil(this.onDestroy)).subscribe((event) => {
if (this.isLoading) return; if (this.isLoading) return;
console.log('Scroll');
// Highlight the current chapter we are on // Highlight the current chapter we are on
if (Object.keys(this.pageAnchors).length !== 0) { if (Object.keys(this.pageAnchors).length !== 0) {
// get the height of the document so we can capture markers that are halfway on the document viewport // get the height of the document so we can capture markers that are halfway on the document viewport
@ -745,9 +743,9 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
if (part !== undefined && part !== '') { if (part !== undefined && part !== '') {
this.scrollTo(part); this.scrollTo(part);
} else if (scrollTop !== undefined && scrollTop !== 0) { } else if (scrollTop !== undefined && scrollTop !== 0) {
this.scrollService.scrollTo(scrollTop); this.scrollService.scrollTo(scrollTop, this.reader.nativeElement);
} else { } else {
this.scrollService.scrollTo(0); this.scrollService.scrollTo(0, this.reader.nativeElement);
} }
} }
@ -971,7 +969,7 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
if (element === null) return; if (element === null) return;
this.scrollService.scrollTo(element.getBoundingClientRect().top + window.pageYOffset + TOP_OFFSET); this.scrollService.scrollTo(element.getBoundingClientRect().top + window.pageYOffset + TOP_OFFSET, this.reader.nativeElement);
} }
toggleClickToPaginate() { toggleClickToPaginate() {

6
UI/Web/src/app/scroll.service.ts
View File

@ -1,4 +1,4 @@
import { Injectable } from '@angular/core'; import { ElementRef, Injectable } from '@angular/core';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@ -13,8 +13,8 @@ export class ScrollService {
|| document.body.scrollTop || 0); || document.body.scrollTop || 0);
} }
scrollTo(top: number) { scrollTo(top: number, el: Element | Window = window) {
window.scroll({ el.scroll({
top: top, top: top,
behavior: 'smooth' behavior: 'smooth'
}); });