From 81082508f2d81dbff00856f1b1988147f2f2127f Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Fri, 20 May 2022 21:05:09 -0500 Subject: [PATCH] Release Shakeout Part 2 (#1267) * Fixed manga reader and removed debug code * Removed some console.logs --- UI/Web/src/app/library-detail/library-detail.component.ts | 3 --- UI/Web/src/app/manga-reader/manga-reader.component.scss | 4 ++-- UI/Web/src/app/manga-reader/manga-reader.component.ts | 2 +- UI/Web/src/app/metadata-filter/metadata-filter.component.ts | 2 -- UI/Web/src/app/sidenav/side-nav/side-nav.component.ts | 1 - 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/UI/Web/src/app/library-detail/library-detail.component.ts b/UI/Web/src/app/library-detail/library-detail.component.ts index ab03150a8..83bb5bf5f 100644 --- a/UI/Web/src/app/library-detail/library-detail.component.ts +++ b/UI/Web/src/app/library-detail/library-detail.component.ts @@ -89,7 +89,6 @@ export class LibraryDetailComponent implements OnInit, OnDestroy { private utilityService: UtilityService, public navService: NavService, private filterUtilityService: FilterUtilitiesService) { const routeId = this.route.snapshot.paramMap.get('libraryId'); if (routeId === null) { - console.log('Redirecting due to not seeing libraryId in route'); this.router.navigateByUrl('/libraries'); return; } @@ -146,10 +145,8 @@ export class LibraryDetailComponent implements OnInit, OnDestroy { if (library === undefined) { lib = {id: this.libraryId, name: this.libraryName}; } - console.log('lib: ', lib); switch (action) { case(Action.ScanLibrary): - console.log('action handler'); this.actionService.scanLibrary(lib); break; case(Action.RefreshMetadata): diff --git a/UI/Web/src/app/manga-reader/manga-reader.component.scss b/UI/Web/src/app/manga-reader/manga-reader.component.scss index c5beaccc9..681425de2 100644 --- a/UI/Web/src/app/manga-reader/manga-reader.component.scss +++ b/UI/Web/src/app/manga-reader/manga-reader.component.scss @@ -248,8 +248,8 @@ img { width: 100%; } - //$pagination-bg: rgba(0, 0, 0, 0); - $pagination-bg: rgba(0, 0, 255, 0.4); + $pagination-bg: rgba(0, 0, 0, 0); + //$pagination-bg: rgba(0, 0, 255, 0.4); .pagination-area { cursor: pointer; diff --git a/UI/Web/src/app/manga-reader/manga-reader.component.ts b/UI/Web/src/app/manga-reader/manga-reader.component.ts index 130ea87be..b128b2331 100644 --- a/UI/Web/src/app/manga-reader/manga-reader.component.ts +++ b/UI/Web/src/app/manga-reader/manga-reader.component.ts @@ -297,7 +297,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { get ImageHeight() { // If we are a cover image and implied fit to screen, then we need to take screen height rather than image height - if (this.isCoverImage()) { + if (this.isCoverImage() || this.generalSettingsForm.get('fittingOption')?.value === FITTING_OPTION.WIDTH) { return this.WindowHeight; } return this.image?.nativeElement.height + 'px'; diff --git a/UI/Web/src/app/metadata-filter/metadata-filter.component.ts b/UI/Web/src/app/metadata-filter/metadata-filter.component.ts index 08e9c71c6..c52d5ea99 100644 --- a/UI/Web/src/app/metadata-filter/metadata-filter.component.ts +++ b/UI/Web/src/app/metadata-filter/metadata-filter.component.ts @@ -601,12 +601,10 @@ export class MetadataFilterComponent implements OnInit, OnDestroy { } toggleSelected() { - //this.filteringCollapsed = !this.filteringCollapsed; this.toggleService.toggle(); } setToggle(event: any) { - console.log('set toggle', event); this.toggleService.set(!this.filteringCollapsed); } diff --git a/UI/Web/src/app/sidenav/side-nav/side-nav.component.ts b/UI/Web/src/app/sidenav/side-nav/side-nav.component.ts index 4f5cc004d..7a5a33fe0 100644 --- a/UI/Web/src/app/sidenav/side-nav/side-nav.component.ts +++ b/UI/Web/src/app/sidenav/side-nav/side-nav.component.ts @@ -63,7 +63,6 @@ export class SideNavComponent implements OnInit, OnDestroy { if (this.utilityService.getActiveBreakpoint() < Breakpoint.Tablet) { // collapse side nav this.navService.sideNavCollapsed$.pipe(take(1)).subscribe(collapsed => { - console.log('Side nav collapsed: ', collapsed); if (!collapsed) { this.navService.toggleSideNav(); }