diff --git a/app/controllers/concerns/paginable.rb b/app/controllers/concerns/paginable.rb index 2d900a7..b9ab72b 100644 --- a/app/controllers/concerns/paginable.rb +++ b/app/controllers/concerns/paginable.rb @@ -56,7 +56,7 @@ # Generates an HTML link to sort given a sort field. # sort_field {String} - Represents the column name for a table def paginable_sort_link(sort_field) - return link_to(sort_link_name(sort_field), sort_link_url(sort_field), 'data-remote': true) + return link_to(sort_link_name(sort_field), sort_link_url(sort_field), 'data-remote': true, class: 'paginable-action') end # Determines whether or not the latest request included the search functionality def searchable? diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb index 958224e..768c763 100644 --- a/app/views/kaminari/_first_page.html.erb +++ b/app/views/kaminari/_first_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page.first?, _('First'), url, remote: remote %> + <%= link_to_unless current_page.first?, _('First'), url, remote: remote, class: 'paginable-action' %> diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb index a37f875..687ae85 100644 --- a/app/views/kaminari/_last_page.html.erb +++ b/app/views/kaminari/_last_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page.last?, _('Last'), url, remote: remote %> + <%= link_to_unless current_page.last?, _('Last'), url, remote: remote, class: 'paginable-action' %> diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb index 6f1fdbb..ad9b2ce 100644 --- a/app/views/kaminari/_next_page.html.erb +++ b/app/views/kaminari/_next_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page.last?, _('Next'), url, rel: 'next', remote: remote %> + <%= link_to_unless current_page.last?, _('Next'), url, rel: 'next', remote: remote, class: 'paginable-action' %> diff --git a/app/views/kaminari/_page.html.erb b/app/views/kaminari/_page.html.erb index 393bfc4..adb0b14 100644 --- a/app/views/kaminari/_page.html.erb +++ b/app/views/kaminari/_page.html.erb @@ -8,5 +8,5 @@ remote: data-remote -%> - <%= link_to_unless page.current?, page, url, {remote: remote, rel: page.rel} %> + <%= link_to_unless page.current?, page, url, {remote: remote, rel: page.rel, class: 'paginable-action'} %> diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb index 28602af..b4d39bd 100644 --- a/app/views/kaminari/_prev_page.html.erb +++ b/app/views/kaminari/_prev_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page.first?, _('Previous'), url, rel: 'prev', remote: remote %> + <%= link_to_unless current_page.first?, _('Previous'), url, rel: 'prev', remote: remote, class: 'paginable-action' %> diff --git a/app/views/layouts/_paginable.html.erb b/app/views/layouts/_paginable.html.erb index 2bc62d2..b29ebee 100644 --- a/app/views/layouts/_paginable.html.erb +++ b/app/views/layouts/_paginable.html.erb @@ -30,22 +30,22 @@ <% if searchable? %> <% else %> <% if paginable? %> - <%= link_to(_('View all'), paginable_base_url_with_query_params(page: 'ALL'), { 'data-remote': true }) if @paginable_options[:view_all] %> + <%= link_to(_('View all'), paginable_base_url_with_query_params(page: 'ALL'), { 'data-remote': true, class: 'paginable-action' }) if @paginable_options[:view_all] %> <% else %> - <%= link_to(_('View less'), paginable_base_url_with_query_params(page: 1), { 'data-remote': true }) %> + <%= link_to(_('View less'), paginable_base_url_with_query_params(page: 1), { 'data-remote': true, class: 'paginable-action' }) %> <% end %> <% end %> <% else %> <% if searchable? %> - <%= link_to(_('Clear search results'), paginable_base_url_with_query_params(page: 1, search: nil), { 'data-remote': true }) %> + <%= link_to(_('Clear search results'), paginable_base_url_with_query_params(page: 1, search: nil), { 'data-remote': true, class: 'paginable-action' }) %> <% end %> <% end %> diff --git a/app/views/shared/_search.html.erb b/app/views/shared/_search.html.erb index 63068bc..5efe38e 100644 --- a/app/views/shared/_search.html.erb +++ b/app/views/shared/_search.html.erb @@ -1,5 +1,5 @@ <% # locals: { search_term } %> -<%= form_tag(paginable_base_url_with_query_params(page: 1), method: :get, remote: true, class: 'form-inline') do %> +<%= form_tag(paginable_base_url_with_query_params(page: 1), method: :get, remote: true, class: 'form-inline paginable-action') do %>
diff --git a/lib/assets/javascripts/utils/paginable.js b/lib/assets/javascripts/utils/paginable.js index 782d63b..78c48c2 100644 --- a/lib/assets/javascripts/utils/paginable.js +++ b/lib/assets/javascripts/utils/paginable.js @@ -11,7 +11,7 @@ // search form submitted. Note the presence of a selector for on (e.g. a[data-remote="true"]) // so that descendant elements from .paginable-results that are added in future are also // automatically handled. - $(paginableSelector).on('ajax:success', 'form[data-remote="true"], a[data-remote="true"]', onAjaxSuccessHandler); + $(paginableSelector).on('ajax:success', 'form.paginable-action[data-remote="true"], a.paginable-action[data-remote="true"]', onAjaxSuccessHandler); }); export { paginableSelector as default };