diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css index 88e829f7a..da138aac1 100644 --- a/app/assets/stylesheets/card-columns.css +++ b/app/assets/stylesheets/card-columns.css @@ -80,7 +80,7 @@ min-inline-size: 0; .blank-slate, - .pagination-link, + .pagination-link.pagination-link--active-when-observed, .card { display: none; } diff --git a/app/helpers/pagination_helper.rb b/app/helpers/pagination_helper.rb index 6205bbfb0..f492b411e 100644 --- a/app/helpers/pagination_helper.rb +++ b/app/helpers/pagination_helper.rb @@ -3,13 +3,13 @@ module PaginationHelper turbo_frame_tag pagination_frame_id_for(namespace, page.number), data: { timeline_target: "frame", **data }, role: "presentation", **attributes, & end - def link_to_next_page(namespace, page, activate_when_observed: false, label: "Load more...", data: {}, **attributes) + def link_to_next_page(namespace, page, activate_when_observed: false, label: default_pagination_label(activate_when_observed), data: {}, **attributes) if page.before_last? && !params[:previous] pagination_link(namespace, page.number + 1, label: label, activate_when_observed: activate_when_observed, data: data, class: "btn txt-small center-block center", **attributes) end end - def pagination_link(namespace, page_number, label: spinner_tag, activate_when_observed: false, url_params: {}, data: {}, **attributes) + def pagination_link(namespace, page_number, activate_when_observed: false, label: default_pagination_label(activate_when_observed), url_params: {}, data: {}, **attributes) link_to label, url_for(params.permit!.to_h.merge(page: page_number, **url_params)), "aria-label": "Load page #{page_number}", class: class_names(attributes.delete(:class), "pagination-link", { "pagination-link--active-when-observed" => activate_when_observed }), @@ -55,7 +55,7 @@ module PaginationHelper def day_timeline_pagination_link(day_timeline, filter) if day_timeline.next_day link_to "Load more…", events_days_path(day: day_timeline.next_day.strftime("%Y-%m-%d"), **filter.as_params), - class: "txt-reversed", data: { frame: day_timeline_pagination_frame_id_for(day_timeline.next_day), pagination_target: "paginationLink" } + class: "txt-reversed", data: { frame: day_timeline_pagination_frame_id_for(day_timeline.next_day), pagination_target: "paginationLink" } end end @@ -67,4 +67,8 @@ module PaginationHelper data: { controller: "pagination", pagination_paginate_on_intersection_value: paginate_on_scroll }, &block end + + def default_pagination_label(activate_when_observed) + "Load more…" + end end