Skip to content

Commit

Permalink
fixed pagy_semantic_nav hellips
Browse files Browse the repository at this point in the history
  • Loading branch information
@ddnexus
ddnexus committed Apr 28, 2021
1 parent 2382482 commit 86fb20e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion lib/pagy/extras/semantic.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def pagy_semantic_nav(pagy, pagy_id: nil, link_extra: '')
html << case item
when Integer then link.call item # page link
when String then %(<a class="item active">#{item}</a>) # current page
when :gap then %(<div class="disabled item">...</div>) # page gap
when :gap then %(<div class="disabled item">#{pagy_t 'pagy.nav.gap'}</div>) # page gap
end
end
html << pagy_semantic_next_html(pagy, link)
Expand Down
12 changes: 6 additions & 6 deletions test/pagy/extras/semantic_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@
it 'renders first page' do
pagy = Pagy.new(count: 1000, page: 1)
_(view.pagy_semantic_nav(pagy)).must_equal \
"<div class=\"pagy-semantic-nav ui pagination menu\" aria-label=\"pager\"><div class=\"item disabled\"><i class=\"left small chevron icon\"></i></div><a class=\"item active\">1</a><a href=\"/foo?page=2\" class=\"item\" \" rel=\"next\" >2</a><a href=\"/foo?page=3\" class=\"item\" \" >3</a><a href=\"/foo?page=4\" class=\"item\" \" >4</a><a href=\"/foo?page=5\" class=\"item\" \" >5</a><div class=\"disabled item\">...</div><a href=\"/foo?page=50\" class=\"item\" \" >50</a><a href=\"/foo?page=2\" class=\"item\" \" rel=\"next\" aria-label=\"next\"><i class=\"right small chevron icon\"></i></a></div>"
"<div class=\"pagy-semantic-nav ui pagination menu\" aria-label=\"pager\"><div class=\"item disabled\"><i class=\"left small chevron icon\"></i></div><a class=\"item active\">1</a><a href=\"/foo?page=2\" class=\"item\" \" rel=\"next\" >2</a><a href=\"/foo?page=3\" class=\"item\" \" >3</a><a href=\"/foo?page=4\" class=\"item\" \" >4</a><a href=\"/foo?page=5\" class=\"item\" \" >5</a><div class=\"disabled item\">&hellip;</div><a href=\"/foo?page=50\" class=\"item\" \" >50</a><a href=\"/foo?page=2\" class=\"item\" \" rel=\"next\" aria-label=\"next\"><i class=\"right small chevron icon\"></i></a></div>"
_(view.pagy_semantic_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_equal \
"<div id=\"test-nav-id\" class=\"pagy-semantic-nav ui pagination menu\" aria-label=\"pager\"><div class=\"item disabled\"><i class=\"left small chevron icon\"></i></div><a class=\"item active\">1</a><a href=\"/foo?page=2\" class=\"item\" link-extra\" rel=\"next\" >2</a><a href=\"/foo?page=3\" class=\"item\" link-extra\" >3</a><a href=\"/foo?page=4\" class=\"item\" link-extra\" >4</a><a href=\"/foo?page=5\" class=\"item\" link-extra\" >5</a><div class=\"disabled item\">...</div><a href=\"/foo?page=50\" class=\"item\" link-extra\" >50</a><a href=\"/foo?page=2\" class=\"item\" link-extra\" rel=\"next\" aria-label=\"next\"><i class=\"right small chevron icon\"></i></a></div>"
"<div id=\"test-nav-id\" class=\"pagy-semantic-nav ui pagination menu\" aria-label=\"pager\"><div class=\"item disabled\"><i class=\"left small chevron icon\"></i></div><a class=\"item active\">1</a><a href=\"/foo?page=2\" class=\"item\" link-extra\" rel=\"next\" >2</a><a href=\"/foo?page=3\" class=\"item\" link-extra\" >3</a><a href=\"/foo?page=4\" class=\"item\" link-extra\" >4</a><a href=\"/foo?page=5\" class=\"item\" link-extra\" >5</a><div class=\"disabled item\">&hellip;</div><a href=\"/foo?page=50\" class=\"item\" link-extra\" >50</a><a href=\"/foo?page=2\" class=\"item\" link-extra\" rel=\"next\" aria-label=\"next\"><i class=\"right small chevron icon\"></i></a></div>"
end
it 'renders intermediate page' do
pagy = Pagy.new(count: 1000, page: 20)
_(view.pagy_semantic_nav(pagy)).must_equal \
"<div class=\"pagy-semantic-nav ui pagination menu\" aria-label=\"pager\"><a href=\"/foo?page=19\" class=\"item\" \" rel=\"prev\" aria-label=\"previous\"><i class=\"left small chevron icon\"></i></a><a href=\"/foo?page=1\" class=\"item\" \" >1</a><div class=\"disabled item\">...</div><a href=\"/foo?page=16\" class=\"item\" \" >16</a><a href=\"/foo?page=17\" class=\"item\" \" >17</a><a href=\"/foo?page=18\" class=\"item\" \" >18</a><a href=\"/foo?page=19\" class=\"item\" \" rel=\"prev\" >19</a><a class=\"item active\">20</a><a href=\"/foo?page=21\" class=\"item\" \" rel=\"next\" >21</a><a href=\"/foo?page=22\" class=\"item\" \" >22</a><a href=\"/foo?page=23\" class=\"item\" \" >23</a><a href=\"/foo?page=24\" class=\"item\" \" >24</a><div class=\"disabled item\">...</div><a href=\"/foo?page=50\" class=\"item\" \" >50</a><a href=\"/foo?page=21\" class=\"item\" \" rel=\"next\" aria-label=\"next\"><i class=\"right small chevron icon\"></i></a></div>"
"<div class=\"pagy-semantic-nav ui pagination menu\" aria-label=\"pager\"><a href=\"/foo?page=19\" class=\"item\" \" rel=\"prev\" aria-label=\"previous\"><i class=\"left small chevron icon\"></i></a><a href=\"/foo?page=1\" class=\"item\" \" >1</a><div class=\"disabled item\">&hellip;</div><a href=\"/foo?page=16\" class=\"item\" \" >16</a><a href=\"/foo?page=17\" class=\"item\" \" >17</a><a href=\"/foo?page=18\" class=\"item\" \" >18</a><a href=\"/foo?page=19\" class=\"item\" \" rel=\"prev\" >19</a><a class=\"item active\">20</a><a href=\"/foo?page=21\" class=\"item\" \" rel=\"next\" >21</a><a href=\"/foo?page=22\" class=\"item\" \" >22</a><a href=\"/foo?page=23\" class=\"item\" \" >23</a><a href=\"/foo?page=24\" class=\"item\" \" >24</a><div class=\"disabled item\">&hellip;</div><a href=\"/foo?page=50\" class=\"item\" \" >50</a><a href=\"/foo?page=21\" class=\"item\" \" rel=\"next\" aria-label=\"next\"><i class=\"right small chevron icon\"></i></a></div>"
_(view.pagy_semantic_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_equal \
"<div id=\"test-nav-id\" class=\"pagy-semantic-nav ui pagination menu\" aria-label=\"pager\"><a href=\"/foo?page=19\" class=\"item\" link-extra\" rel=\"prev\" aria-label=\"previous\"><i class=\"left small chevron icon\"></i></a><a href=\"/foo?page=1\" class=\"item\" link-extra\" >1</a><div class=\"disabled item\">...</div><a href=\"/foo?page=16\" class=\"item\" link-extra\" >16</a><a href=\"/foo?page=17\" class=\"item\" link-extra\" >17</a><a href=\"/foo?page=18\" class=\"item\" link-extra\" >18</a><a href=\"/foo?page=19\" class=\"item\" link-extra\" rel=\"prev\" >19</a><a class=\"item active\">20</a><a href=\"/foo?page=21\" class=\"item\" link-extra\" rel=\"next\" >21</a><a href=\"/foo?page=22\" class=\"item\" link-extra\" >22</a><a href=\"/foo?page=23\" class=\"item\" link-extra\" >23</a><a href=\"/foo?page=24\" class=\"item\" link-extra\" >24</a><div class=\"disabled item\">...</div><a href=\"/foo?page=50\" class=\"item\" link-extra\" >50</a><a href=\"/foo?page=21\" class=\"item\" link-extra\" rel=\"next\" aria-label=\"next\"><i class=\"right small chevron icon\"></i></a></div>"
"<div id=\"test-nav-id\" class=\"pagy-semantic-nav ui pagination menu\" aria-label=\"pager\"><a href=\"/foo?page=19\" class=\"item\" link-extra\" rel=\"prev\" aria-label=\"previous\"><i class=\"left small chevron icon\"></i></a><a href=\"/foo?page=1\" class=\"item\" link-extra\" >1</a><div class=\"disabled item\">&hellip;</div><a href=\"/foo?page=16\" class=\"item\" link-extra\" >16</a><a href=\"/foo?page=17\" class=\"item\" link-extra\" >17</a><a href=\"/foo?page=18\" class=\"item\" link-extra\" >18</a><a href=\"/foo?page=19\" class=\"item\" link-extra\" rel=\"prev\" >19</a><a class=\"item active\">20</a><a href=\"/foo?page=21\" class=\"item\" link-extra\" rel=\"next\" >21</a><a href=\"/foo?page=22\" class=\"item\" link-extra\" >22</a><a href=\"/foo?page=23\" class=\"item\" link-extra\" >23</a><a href=\"/foo?page=24\" class=\"item\" link-extra\" >24</a><div class=\"disabled item\">&hellip;</div><a href=\"/foo?page=50\" class=\"item\" link-extra\" >50</a><a href=\"/foo?page=21\" class=\"item\" link-extra\" rel=\"next\" aria-label=\"next\"><i class=\"right small chevron icon\"></i></a></div>"
end
it 'renders last page' do
pagy = Pagy.new(count: 1000, page: 50)
_(view.pagy_semantic_nav(pagy)).must_equal \
"<div class=\"pagy-semantic-nav ui pagination menu\" aria-label=\"pager\"><a href=\"/foo?page=49\" class=\"item\" \" rel=\"prev\" aria-label=\"previous\"><i class=\"left small chevron icon\"></i></a><a href=\"/foo?page=1\" class=\"item\" \" >1</a><div class=\"disabled item\">...</div><a href=\"/foo?page=46\" class=\"item\" \" >46</a><a href=\"/foo?page=47\" class=\"item\" \" >47</a><a href=\"/foo?page=48\" class=\"item\" \" >48</a><a href=\"/foo?page=49\" class=\"item\" \" rel=\"prev\" >49</a><a class=\"item active\">50</a><div class=\"item disabled\"><i class=\"right small chevron icon\"></i></div></div>"
"<div class=\"pagy-semantic-nav ui pagination menu\" aria-label=\"pager\"><a href=\"/foo?page=49\" class=\"item\" \" rel=\"prev\" aria-label=\"previous\"><i class=\"left small chevron icon\"></i></a><a href=\"/foo?page=1\" class=\"item\" \" >1</a><div class=\"disabled item\">&hellip;</div><a href=\"/foo?page=46\" class=\"item\" \" >46</a><a href=\"/foo?page=47\" class=\"item\" \" >47</a><a href=\"/foo?page=48\" class=\"item\" \" >48</a><a href=\"/foo?page=49\" class=\"item\" \" rel=\"prev\" >49</a><a class=\"item active\">50</a><div class=\"item disabled\"><i class=\"right small chevron icon\"></i></div></div>"
_(view.pagy_semantic_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_equal \
"<div id=\"test-nav-id\" class=\"pagy-semantic-nav ui pagination menu\" aria-label=\"pager\"><a href=\"/foo?page=49\" class=\"item\" link-extra\" rel=\"prev\" aria-label=\"previous\"><i class=\"left small chevron icon\"></i></a><a href=\"/foo?page=1\" class=\"item\" link-extra\" >1</a><div class=\"disabled item\">...</div><a href=\"/foo?page=46\" class=\"item\" link-extra\" >46</a><a href=\"/foo?page=47\" class=\"item\" link-extra\" >47</a><a href=\"/foo?page=48\" class=\"item\" link-extra\" >48</a><a href=\"/foo?page=49\" class=\"item\" link-extra\" rel=\"prev\" >49</a><a class=\"item active\">50</a><div class=\"item disabled\"><i class=\"right small chevron icon\"></i></div></div>"
"<div id=\"test-nav-id\" class=\"pagy-semantic-nav ui pagination menu\" aria-label=\"pager\"><a href=\"/foo?page=49\" class=\"item\" link-extra\" rel=\"prev\" aria-label=\"previous\"><i class=\"left small chevron icon\"></i></a><a href=\"/foo?page=1\" class=\"item\" link-extra\" >1</a><div class=\"disabled item\">&hellip;</div><a href=\"/foo?page=46\" class=\"item\" link-extra\" >46</a><a href=\"/foo?page=47\" class=\"item\" link-extra\" >47</a><a href=\"/foo?page=48\" class=\"item\" link-extra\" >48</a><a href=\"/foo?page=49\" class=\"item\" link-extra\" rel=\"prev\" >49</a><a class=\"item active\">50</a><div class=\"item disabled\"><i class=\"right small chevron icon\"></i></div></div>"
end
end

Expand Down

0 comments on commit 86fb20e

Please sign in to comment.