bring link_tag generation logic back into the main logic
This commit is contained in:
parent
5b76f94b51
commit
a1a3d64a8d
|
@ -12,7 +12,13 @@
|
|||
<% if page.current? -%>
|
||||
<%= current_page_tag %>
|
||||
<% elsif page.left_outer? || page.right_outer? || page.inside_window? -%>
|
||||
<%= page_link_tag %>
|
||||
<% if page.first? -%>
|
||||
<%= first_page_link_tag %>
|
||||
<% elsif page.last? -%>
|
||||
<%= last_page_link_tag %>
|
||||
<% else -%>
|
||||
<%= page_link_tag %>
|
||||
<% end -%>
|
||||
<% elsif !page.was_truncated? -%>
|
||||
<%= truncated_span_tag %>
|
||||
<% end -%>
|
||||
|
|
|
@ -11,7 +11,12 @@
|
|||
- if page.current?
|
||||
= current_page_tag
|
||||
- elsif page.left_outer? || page.right_outer? || page.inside_window?
|
||||
= page_link_tag
|
||||
- if page.first?
|
||||
= first_page_link_tag
|
||||
- elsif page.last?
|
||||
= last_page_link_tag
|
||||
- else
|
||||
= page_link_tag
|
||||
- elsif !page.was_truncated?
|
||||
= truncated_span_tag
|
||||
= num_pages > current_page ? next_link_tag : next_span_tag
|
||||
|
|
|
@ -13,19 +13,12 @@ module Kaminari
|
|||
@left, @window, @right = (options[:left] || options[:outer_window] || 1), (options[:window] || options[:inner_window] || 4), (options[:right] || options[:outer_window] || 1)
|
||||
end
|
||||
|
||||
def current_page_tag
|
||||
@last = CurrentPage.new self, :page => @page
|
||||
end
|
||||
|
||||
def page_link_tag
|
||||
@last = case @page
|
||||
when 1
|
||||
FirstPageLink
|
||||
when @options[:num_pages]
|
||||
LastPageLink
|
||||
else
|
||||
PageLink
|
||||
end.new self, :page => @page
|
||||
%w[current_page first_page_link last_page_link page_link].each do |tag|
|
||||
eval <<-DEF
|
||||
def #{tag}_tag
|
||||
@last = #{tag.classify}.new self, :page => @page
|
||||
end
|
||||
DEF
|
||||
end
|
||||
|
||||
%w[prev_link prev_span next_link next_span truncated_span].each do |tag|
|
||||
|
@ -109,6 +102,14 @@ module Kaminari
|
|||
@page == @renderer.options[:current_page]
|
||||
end
|
||||
|
||||
def first?
|
||||
@page == 1
|
||||
end
|
||||
|
||||
def last?
|
||||
@page == @renderer.options[:num_pages]
|
||||
end
|
||||
|
||||
def left_outer?
|
||||
@page <= @renderer.left + 1
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue