Merge pull request #10216 from kraktus/swiss_round_no_scroll

Swiss round page is not an infiniteScroll page
deepcrayonfish^2
Thibault Duplessis 2021-12-10 08:03:14 +01:00 committed by GitHub
commit 70e073ec65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions

View File

@ -83,8 +83,7 @@ object show {
def round(s: Swiss, r: SwissRound.Number, pairings: Paginator[SwissPairing])(implicit ctx: Context) = def round(s: Swiss, r: SwissRound.Number, pairings: Paginator[SwissPairing])(implicit ctx: Context) =
views.html.base.layout( views.html.base.layout(
title = s"${fullName(s)} • Round $r/${s.round}", title = s"${fullName(s)} • Round $r/${s.round}",
moreCss = cssTag("swiss.show"), moreCss = cssTag("swiss.show")
moreJs = infiniteScrollTag
) { ) {
val pager = views.html.base.bits val pager = views.html.base.bits
.pagination(p => routes.Swiss.round(s.id.value, p).url, r.value, s.round.value, showPost = true) .pagination(p => routes.Swiss.round(s.id.value, p).url, r.value, s.round.value, showPost = true)
@ -95,7 +94,6 @@ object show {
), ),
pager(cls := "pagination--top"), pager(cls := "pagination--top"),
table(cls := "slist slist-pad")( table(cls := "slist slist-pad")(
tbody(cls := "infinite-scroll")(
pairings.currentPageResults map { p => pairings.currentPageResults map { p =>
tr(cls := "paginated")( tr(cls := "paginated")(
td(a(href := routes.Round.watcher(p.gameId, "white"), cls := "glpt")(s"#${p.gameId}")), td(a(href := routes.Round.watcher(p.gameId, "white"), cls := "glpt")(s"#${p.gameId}")),
@ -104,9 +102,7 @@ object show {
td(p strResultOf chess.Black), td(p strResultOf chess.Black),
td(userIdLink(p.black.some)) td(userIdLink(p.black.some))
) )
}, }
pagerNextTable(pairings, p => routes.Swiss.round(s.id.value, r.value).url)
)
), ),
pager(cls := "pagination--bottom") pager(cls := "pagination--bottom")
) )