Merge pull request #28 from pgiro/fix-even-season-card-display-bug

Fix issue where card display would not show future season card when in an even season (i.e. S10) after navigating back to the S8/9 card
This commit is contained in:
Peter 2024-07-08 07:56:49 -05:00 committed by GitHub
commit 3b9fe336a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -87,6 +87,8 @@ export default {
if (season % 2 === 0) season-- if (season % 2 === 0) season--
else season -= 2 else season -= 2
season = Math.max(season, 1)
if (this.cardImage1UrlBySeasonNumber.has(season) if (this.cardImage1UrlBySeasonNumber.has(season)
&& currentImage !== this.cardImage1UrlBySeasonNumber.get(season)) { && currentImage !== this.cardImage1UrlBySeasonNumber.get(season)) {
return true return true
@ -97,10 +99,12 @@ export default {
hasNextCard(): boolean { hasNextCard(): boolean {
const currentImage = this.cardImage1UrlBySeasonNumber.get(this.currentSeasonNumber) const currentImage = this.cardImage1UrlBySeasonNumber.get(this.currentSeasonNumber)
let season = this.currentSeasonNumber let season = this.currentSeasonNumber
while (season <= CURRENT_SEASON) { while (season < CURRENT_SEASON) {
if (season % 2 === 0) season++ if (season % 2 === 0) season++
else season += 2 else season += 2
season = Math.min(season, CURRENT_SEASON)
if (this.cardImage1UrlBySeasonNumber.has(season) if (this.cardImage1UrlBySeasonNumber.has(season)
&& currentImage !== this.cardImage1UrlBySeasonNumber.get(season)) { && currentImage !== this.cardImage1UrlBySeasonNumber.get(season)) {
return true return true