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 up jumpbar not properly disabling/enabling (#2022)

Browse Source
This commit is contained in:
Joe Milazzo 2023-05-30 14:32:48 -05:00 committed by GitHub
parent 23a896b1b0
commit de8052d752
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.ts
View File

@ -7,7 +7,7 @@ import {
ContentChild, ContentChild,
ElementRef, ElementRef,
EventEmitter, EventEmitter,
HostListener, HostListener, inject,
Inject, Inject,
Input, Input,
OnChanges, OnChanges,
@ -76,7 +76,8 @@ export class CardDetailLayoutComponent implements OnInit, OnChanges {
@ViewChild(VirtualScrollerComponent) private virtualScroller!: VirtualScrollerComponent; @ViewChild(VirtualScrollerComponent) private virtualScroller!: VirtualScrollerComponent;
filter!: SeriesFilter; private readonly filterUtilityService = inject(FilterUtilitiesService);
filter: SeriesFilter = this.filterUtilityService.createSeriesFilter();
libraries: Array<FilterItem<Library>> = []; libraries: Array<FilterItem<Library>> = [];
updateApplied: number = 0; updateApplied: number = 0;
@ -86,12 +87,9 @@ export class CardDetailLayoutComponent implements OnInit, OnChanges {
return Breakpoint; return Breakpoint;
} }
constructor(private filterUtilitySerivce: FilterUtilitiesService, public utilityService: UtilityService, constructor(public utilityService: UtilityService,
@Inject(DOCUMENT) private document: Document, private changeDetectionRef: ChangeDetectorRef, @Inject(DOCUMENT) private document: Document, private cdRef: ChangeDetectorRef,
private jumpbarService: JumpbarService, private router: Router, private scrollService: ScrollService) { private jumpbarService: JumpbarService, private router: Router, private scrollService: ScrollService) {
this.filter = this.filterUtilitySerivce.createSeriesFilter();
this.changeDetectionRef.markForCheck();
} }
@HostListener('window:resize', ['$event']) @HostListener('window:resize', ['$event'])
@ -99,7 +97,7 @@ export class CardDetailLayoutComponent implements OnInit, OnChanges {
resizeJumpBar() { resizeJumpBar() {
const currentSize = (this.document.querySelector('.viewport-container')?.getBoundingClientRect().height || 10) - 30; const currentSize = (this.document.querySelector('.viewport-container')?.getBoundingClientRect().height || 10) - 30;
this.jumpBarKeysToRender = this.jumpbarService.generateJumpBar(this.jumpBarKeys, currentSize); this.jumpBarKeysToRender = this.jumpbarService.generateJumpBar(this.jumpBarKeys, currentSize);
this.changeDetectionRef.markForCheck(); this.cdRef.markForCheck();
} }
ngOnInit(): void { ngOnInit(): void {
@ -109,17 +107,17 @@ export class CardDetailLayoutComponent implements OnInit, OnChanges {
if (this.filterSettings === undefined) { if (this.filterSettings === undefined) {
this.filterSettings = new FilterSettings(); this.filterSettings = new FilterSettings();
this.changeDetectionRef.markForCheck(); this.cdRef.markForCheck();
} }
if (this.pagination === undefined) { if (this.pagination === undefined) {
this.pagination = {currentPage: 1, itemsPerPage: this.items.length, totalItems: this.items.length, totalPages: 1}; this.pagination = {currentPage: 1, itemsPerPage: this.items.length, totalItems: this.items.length, totalPages: 1};
this.changeDetectionRef.markForCheck(); this.cdRef.markForCheck();
} }
if (this.refresh) { if (this.refresh) {
this.refresh.subscribe(() => { this.refresh.subscribe(() => {
this.changeDetectionRef.markForCheck(); this.cdRef.markForCheck();
this.virtualScroller.refresh(); this.virtualScroller.refresh();
}); });
} }
@ -152,7 +150,7 @@ export class CardDetailLayoutComponent implements OnInit, OnChanges {
} }
hasCustomSort() { hasCustomSort() {
return this.filter.sortOptions !== null || this.filterSettings?.presets?.sortOptions !== undefined; return this.filter.sortOptions || this.filterSettings?.presets?.sortOptions;
} }
performAction(action: ActionItem<any>) { performAction(action: ActionItem<any>) {
@ -164,7 +162,8 @@ export class CardDetailLayoutComponent implements OnInit, OnChanges {
applyMetadataFilter(event: FilterEvent) { applyMetadataFilter(event: FilterEvent) {
this.applyFilter.emit(event); this.applyFilter.emit(event);
this.updateApplied++; this.updateApplied++;
this.changeDetectionRef.markForCheck(); this.filter = event.filter;
this.cdRef.markForCheck();
} }
@ -172,7 +171,7 @@ export class CardDetailLayoutComponent implements OnInit, OnChanges {
if (this.hasCustomSort()) return; if (this.hasCustomSort()) return;
let targetIndex = 0; let targetIndex = 0;
for(var i = 0; i < this.jumpBarKeys.length; i++) { for(let i = 0; i < this.jumpBarKeys.length; i++) {
if (this.jumpBarKeys[i].key === jumpKey.key) break; if (this.jumpBarKeys[i].key === jumpKey.key) break;
targetIndex += this.jumpBarKeys[i].size; targetIndex += this.jumpBarKeys[i].size;
} }
@ -181,7 +180,7 @@ export class CardDetailLayoutComponent implements OnInit, OnChanges {
this.jumpbarService.saveResumeKey(this.router.url, jumpKey.key); this.jumpbarService.saveResumeKey(this.router.url, jumpKey.key);
// TODO: This doesn't work, we need the offset from virtual scroller // TODO: This doesn't work, we need the offset from virtual scroller
this.jumpbarService.saveScrollOffset(this.router.url, this.scrollService.scrollPosition); this.jumpbarService.saveScrollOffset(this.router.url, this.scrollService.scrollPosition);
this.changeDetectionRef.markForCheck(); this.cdRef.markForCheck();
} }
tryToSaveJumpKey(item: any) { tryToSaveJumpKey(item: any) {

2
openapi.json
View File

@ -7,7 +7,7 @@
"name": "GPL-3.0", "name": "GPL-3.0",
"url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE" "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"
}, },
"version": "0.7.2.22" "version": "0.7.2.24"
}, },
"servers": [ "servers": [
{ {