From 771a2227872fba01620585d06ab8f34d0648510d Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Mon, 26 Feb 2018 12:48:25 +0100 Subject: [PATCH] Fixed scrolling on soundtracks --- pages/soundtracks/soundtracks.go | 6 +++++- pages/soundtracks/soundtracks.pixy | 6 +++--- tests.go | 12 ++---------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pages/soundtracks/soundtracks.go b/pages/soundtracks/soundtracks.go index f881d2a5..9b4bef50 100644 --- a/pages/soundtracks/soundtracks.go +++ b/pages/soundtracks/soundtracks.go @@ -22,11 +22,15 @@ func Latest(ctx *aero.Context) string { arn.SortSoundTracksLatestFirst(tracks) + // Limit the number of displayed tracks + loadMoreIndex := 0 + if len(tracks) > maxTracks { tracks = tracks[:maxTracks] + loadMoreIndex = maxTracks } - return ctx.HTML(components.SoundTracks(tracks, maxTracks, user)) + return ctx.HTML(components.SoundTracks(tracks, loadMoreIndex, user)) } // LatestFrom renders the soundtracks from the given index. diff --git a/pages/soundtracks/soundtracks.pixy b/pages/soundtracks/soundtracks.pixy index a4e41ad8..e09d9844 100644 --- a/pages/soundtracks/soundtracks.pixy +++ b/pages/soundtracks/soundtracks.pixy @@ -1,4 +1,4 @@ -component SoundTracks(tracks []*arn.SoundTrack, tracksPerPage int, user *arn.User) +component SoundTracks(tracks []*arn.SoundTrack, loadMoreIndex int, user *arn.User) h1.page-title Soundtracks SoundTracksTabs @@ -17,9 +17,9 @@ component SoundTracks(tracks []*arn.SoundTrack, tracksPerPage int, user *arn.Use #load-more-target.sound-tracks SoundTracksScrollable(tracks, user) - if len(tracks) == tracksPerPage + if loadMoreIndex != 0 .buttons - LoadMore(tracksPerPage) + LoadMore(loadMoreIndex) component SoundTracksScrollable(tracks []*arn.SoundTrack, user *arn.User) each track in tracks diff --git a/tests.go b/tests.go index 0a137597..79a98650 100644 --- a/tests.go +++ b/tests.go @@ -88,19 +88,11 @@ var routeTests = map[string][]string{ }, "/quote/:id": []string{ - "/quote/-8I3JKykR", + "/quote/gUZugd6zR", }, "/quote/:id/edit": []string{ - "/quote/-8I3JKykR/edit", - }, - - "/quotes": []string{ - "/quotes", - }, - - "/quotes/best": []string{ - "/quotes/best", + "/quote/gUZugd6zR/edit", }, "/quotes/from/:index": []string{