From 1c860bd0d97bf0ec0e9e740824d2aef4ba416de5 Mon Sep 17 00:00:00 2001 From: Geomitron <22552797+Geomitron@users.noreply.github.com> Date: Tue, 6 Apr 2021 18:40:00 -0500 Subject: [PATCH] v1.3.1 - Fixed theme css path - Fixed slider thumbs initializing in the wrong position --- angular.json | 3 ++ package-lock.json | 2 +- package.json | 2 +- .../browse/search-bar/search-bar.component.ts | 29 ++++++++++++------- src/app/core/services/settings.service.ts | 2 +- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/angular.json b/angular.json index 49092b9..41e191e 100644 --- a/angular.json +++ b/angular.json @@ -1,5 +1,8 @@ { "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "cli": { + "analytics": false + }, "version": 1, "newProjectRoot": "projects", "projects": { diff --git a/package-lock.json b/package-lock.json index ea20347..9365705 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bridge", - "version": "1.3.0", + "version": "1.3.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ed94bac..c0bdfff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bridge", - "version": "1.3.0", + "version": "1.3.1", "description": "A Clone Hero library management tool with built in chart searching and downloading.", "homepage": "https://github.com/Geomitron/Bridge", "license": "GPL-3.0", diff --git a/src/app/components/browse/search-bar/search-bar.component.ts b/src/app/components/browse/search-bar/search-bar.component.ts index 7cc7a03..9c84385 100644 --- a/src/app/components/browse/search-bar/search-bar.component.ts +++ b/src/app/components/browse/search-bar/search-bar.component.ts @@ -17,6 +17,7 @@ export class SearchBarComponent implements AfterViewInit { isError = false showAdvanced = false searchSettings = getDefaultSearch() + private sliderInitialized = false constructor(public searchService: SearchService) { } @@ -37,17 +38,6 @@ export class SearchBarComponent implements AfterViewInit { this.searchSettings.similarity = value as 'similar' | 'exact' } }) - $(this.diffSlider.nativeElement).slider({ - min: 0, - max: 6, - start: 0, - end: 6, - step: 1, - onChange: (_length: number, min: number, max: number) => { - this.searchSettings.minDiff = min - this.searchSettings.maxDiff = max - } - }) } onSearch(query: string) { @@ -59,6 +49,23 @@ export class SearchBarComponent implements AfterViewInit { onAdvancedSearchClick() { this.showAdvanced = !this.showAdvanced + + if (!this.sliderInitialized) { + setTimeout(() => { // Initialization requires this element to not be collapsed + $(this.diffSlider.nativeElement).slider({ + min: 0, + max: 6, + start: 0, + end: 6, + step: 1, + onChange: (_length: number, min: number, max: number) => { + this.searchSettings.minDiff = min + this.searchSettings.maxDiff = max + } + }) + }, 50) + this.sliderInitialized = true + } } isLoading() { diff --git a/src/app/core/services/settings.service.ts b/src/app/core/services/settings.service.ts index 4abaf56..2e6c2df 100644 --- a/src/app/core/services/settings.service.ts +++ b/src/app/core/services/settings.service.ts @@ -39,7 +39,7 @@ export class SettingsService { const link = document.createElement('link') link.type = 'text/css' link.rel = 'stylesheet' - link.href = `./assets/themes/${theme}.css` + link.href = `./assets/themes/${theme.toLowerCase()}.css` this.currentThemeLink = document.head.appendChild(link) }