myxelium/Bridge-Multi
1
0
Fork 0
mirror of https://github.com/Myxelium/Bridge-Multi.git synced 2026-07-07 18:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with infinite scroll

Browse Source
This commit is contained in:
Geomitron
2024-07-28 10:09:48 -05:00
parent e953a3fbfb
commit 871fb1979a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src-angular/app/core/services/search.service.ts
View File

@@ -22,6 +22,7 @@ export class SearchService {
public newSearch = new EventEmitter<Partial<SearchResult>>() public newSearch = new EventEmitter<Partial<SearchResult>>()
public updateSearch = new EventEmitter<Partial<SearchResult>>() public updateSearch = new EventEmitter<Partial<SearchResult>>()
public isDefaultSearch = true public isDefaultSearch = true
public isAdvancedSearch = false
public lastAdvancedSearch: AdvancedSearch public lastAdvancedSearch: AdvancedSearch
public groupedSongs: ChartData[][] public groupedSongs: ChartData[][]
@@ -85,6 +86,7 @@ export class SearchService {
public search(search = '*', nextPage = false) { public search(search = '*', nextPage = false) {
this.searchLoading = true this.searchLoading = true
this.isDefaultSearch = search === '*' this.isDefaultSearch = search === '*'
this.isAdvancedSearch = false
if (nextPage) { if (nextPage) {
this.currentPage++ this.currentPage++
@@ -145,6 +147,7 @@ export class SearchService {
public advancedSearch(search: AdvancedSearch, nextPage = false) { public advancedSearch(search: AdvancedSearch, nextPage = false) {
this.searchLoading = true this.searchLoading = true
this.isDefaultSearch = false this.isDefaultSearch = false
this.isAdvancedSearch = true
this.lastAdvancedSearch = search this.lastAdvancedSearch = search
if (nextPage) { if (nextPage) {
@@ -202,10 +205,10 @@ export class SearchService {
public getNextSearchPage() { public getNextSearchPage() {
if (this.areMorePages && !this.searchLoading) { if (this.areMorePages && !this.searchLoading) {
if (this.isDefaultSearch) { if (this.isAdvancedSearch) {
this.search(this.searchControl.value || '*', true).subscribe()
} else {
this.advancedSearch(this.lastAdvancedSearch, true).subscribe() this.advancedSearch(this.lastAdvancedSearch, true).subscribe()
} else {
this.search(this.searchControl.value || '*', true).subscribe()
} }
} }
} }