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

Release Testing Bugs (#1790)

Browse source 
* Stop showing loading indicator when no next/prev chapter

* Fixed a bug where manage collections wasn't named correctly in UI.

* Slight tweaks on email flow
This commit is contained in:
Joe Milazzo 2023-02-16 06:39:40 -06:00 • committed by GitHub
parent e50f5ece1e
commit 00f153d8ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 66 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
UI/Web/src/app/_models/library.ts
View file

@ -15,5 +15,5 @@ export interface Library {
includeInDashboard: boolean;
includeInRecommended: boolean;
includeInSearch: boolean;
manageCollections: boolean;
createCollections: boolean;
}

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

@ -245,7 +245,14 @@ export class ReaderSettingsComponent implements OnInit, OnDestroy {
}
this.settingsForm.get('bookReaderFontFamily')?.setValue(this.user.preferences.bookReaderFontFamily);
this.cdRef.markForCheck();
this.settingsForm.get('bookReaderFontSize')?.setValue(this.user.preferences.bookReaderFontSize);
this.settingsForm.get('bookReaderLineSpacing')?.setValue(this.user.preferences.bookReaderLineSpacing);
this.settingsForm.get('bookReaderMargin')?.setValue(this.user.preferences.bookReaderMargin);
this.settingsForm.get('bookReaderReadingDirection')?.setValue(this.user.preferences.bookReaderReadingDirection);
this.settingsForm.get('bookReaderTapToPaginate')?.setValue(this.user.preferences.bookReaderTapToPaginate);
this.settingsForm.get('layoutMode')?.setValue(this.user.preferences.layoutMode);
this.settingsForm.get('bookReaderImmersiveMode')?.setValue(this.user.preferences.bookReaderImmersiveMode);
this.cdRef.detectChanges();
this.styleUpdate.emit(this.pageStyles);
}

4
UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts
View file

@ -1173,6 +1173,8 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
loadNextChapter() {
if (this.nextPageDisabled || this.nextChapterDisabled || this.bookmarkMode) {
this.toastr.info('No Next Chapter');
this.isLoading = false;
this.cdRef.markForCheck();
return;
}
@ -1189,6 +1191,8 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
loadPrevChapter() {
if (this.prevPageDisabled || this.prevChapterDisabled || this.bookmarkMode) {
this.toastr.info('No Previous Chapter');
this.isLoading = false;
this.cdRef.markForCheck();
return;
}
this.continuousChaptersStack.pop();

2
UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.html
View file

@ -96,7 +96,7 @@
<div class="col-md-12 col-sm-12 pe-2 mb-2">
<div class="mb-3 mt-1">
<div class="form-check form-switch">
<input type="checkbox" id="manage-collections" role="switch" formControlName="manageCollections" class="form-check-input" aria-labelledby="auto-close-label">
<input type="checkbox" id="manage-collections" role="switch" formControlName="createCollections" class="form-check-input" aria-labelledby="auto-close-label">
<label class="form-check-label" for="manage-collections">Manage Collections</label>
</div>
</div>

2
UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.ts
View file

@ -118,7 +118,7 @@ export class LibrarySettingsModalComponent implements OnInit, OnDestroy {
this.libraryForm.get('includeInDashboard')?.setValue(this.library.includeInDashboard);
this.libraryForm.get('includeInRecommended')?.setValue(this.library.includeInRecommended);
this.libraryForm.get('includeInSearch')?.setValue(this.library.includeInSearch);
this.libraryForm.get('manageCollections')?.setValue(this.library.manageCollections);
this.libraryForm.get('createCollections')?.setValue(this.library.createCollections);
this.selectedFolders = this.library.folders;
this.madeChanges = false;
this.cdRef.markForCheck();