Skip to content

Commit

Permalink
Merge pull request #624 from carloslancha/issue-623-pagination-range
Browse files Browse the repository at this point in the history 
Fix ClayPagination range | Fixes #623
  • Loading branch information
@matuzalemsteles
matuzalemsteles authored Feb 22, 2018
2 parents a20fe88 + 7165fe6 commit 5fb382f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 40 deletions.
2 changes: 1 addition & 1 deletion packages/clay-pagination/src/ClayPagination.soy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
{call .range}
{param baseHref: $baseHref /}
{param endPage: $totalPages /}
{param initPage: $currentPage + 2 /}
{param initPage: $currentPage == 1 ? 4 : $currentPage + 2 /}
{/call}
{/if}

Expand Down
39 changes: 0 additions & 39 deletions packages/clay-pagination/src/__tests__/__snapshots__/ClayPagination.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,9 +519,6 @@ exports[`ClayPagination should render a ClayPagination with 6 total pages and pa
<div class="dropdown-menu" ref="menu">
<ul class="list-unstyled">
<ul class="list-unstyled">
<li>
<a class=" dropdown-item" href="#3">3</a>
</li>
<li>
<a class=" dropdown-item" href="#4">4</a>
</li>
Expand Down Expand Up @@ -800,9 +797,6 @@ exports[`ClayPagination should render a ClayPagination with 7 total pages and pa
<div class="dropdown-menu" ref="menu">
<ul class="list-unstyled">
<ul class="list-unstyled">
<li>
<a class=" dropdown-item" href="#3">3</a>
</li>
<li>
<a class=" dropdown-item" href="#4">4</a>
</li>
Expand Down Expand Up @@ -1163,9 +1157,6 @@ exports[`ClayPagination should render a ClayPagination with 8 total pages and pa
<div class="dropdown-menu" ref="menu">
<ul class="list-unstyled">
<ul class="list-unstyled">
<li>
<a class=" dropdown-item" href="#3">3</a>
</li>
<li>
<a class=" dropdown-item" href="#4">4</a>
</li>
Expand Down Expand Up @@ -1614,9 +1605,6 @@ exports[`ClayPagination should render a ClayPagination with 9 total pages and pa
<div class="dropdown-menu" ref="menu">
<ul class="list-unstyled">
<ul class="list-unstyled">
<li>
<a class=" dropdown-item" href="#3">3</a>
</li>
<li>
<a class=" dropdown-item" href="#4">4</a>
</li>
Expand Down Expand Up @@ -2159,9 +2147,6 @@ exports[`ClayPagination should render a ClayPagination with 10 total pages and p
<div class="dropdown-menu" ref="menu">
<ul class="list-unstyled">
<ul class="list-unstyled">
<li>
<a class=" dropdown-item" href="#3">3</a>
</li>
<li>
<a class=" dropdown-item" href="#4">4</a>
</li>
Expand Down Expand Up @@ -3284,9 +3269,6 @@ exports[`ClayPagination should render a ClayPagination with baseHref, 6 total pa
<div class="dropdown-menu" ref="menu">
<ul class="list-unstyled">
<ul class="list-unstyled">
<li>
<a class=" dropdown-item" href="#mySite?curPage=3">3</a>
</li>
<li>
<a class=" dropdown-item" href="#mySite?curPage=4">4</a>
</li>
Expand Down Expand Up @@ -3565,9 +3547,6 @@ exports[`ClayPagination should render a ClayPagination with baseHref, 7 total pa
<div class="dropdown-menu" ref="menu">
<ul class="list-unstyled">
<ul class="list-unstyled">
<li>
<a class=" dropdown-item" href="#mySite?curPage=3">3</a>
</li>
<li>
<a class=" dropdown-item" href="#mySite?curPage=4">4</a>
</li>
Expand Down Expand Up @@ -3928,9 +3907,6 @@ exports[`ClayPagination should render a ClayPagination with baseHref, 8 total pa
<div class="dropdown-menu" ref="menu">
<ul class="list-unstyled">
<ul class="list-unstyled">
<li>
<a class=" dropdown-item" href="#mySite?curPage=3">3</a>
</li>
<li>
<a class=" dropdown-item" href="#mySite?curPage=4">4</a>
</li>
Expand Down Expand Up @@ -4379,9 +4355,6 @@ exports[`ClayPagination should render a ClayPagination with baseHref, 9 total pa
<div class="dropdown-menu" ref="menu">
<ul class="list-unstyled">
<ul class="list-unstyled">
<li>
<a class=" dropdown-item" href="#mySite?curPage=3">3</a>
</li>
<li>
<a class=" dropdown-item" href="#mySite?curPage=4">4</a>
</li>
Expand Down Expand Up @@ -4924,9 +4897,6 @@ exports[`ClayPagination should render a ClayPagination with baseHref, 10 total p
<div class="dropdown-menu" ref="menu">
<ul class="list-unstyled">
<ul class="list-unstyled">
<li>
<a class=" dropdown-item" href="#mySite?curPage=3">3</a>
</li>
<li>
<a class=" dropdown-item" href="#mySite?curPage=4">4</a>
</li>
Expand Down Expand Up @@ -5569,9 +5539,6 @@ exports[`ClayPagination should render a ClayPagination with classes 1`] = `
<div class="dropdown-menu" ref="menu">
<ul class="list-unstyled">
<ul class="list-unstyled">
<li>
<a class=" dropdown-item" href="#3">3</a>
</li>
<li>
<a class=" dropdown-item" href="#4">4</a>
</li>
Expand Down Expand Up @@ -5634,9 +5601,6 @@ exports[`ClayPagination should render a ClayPagination with id 1`] = `
<div class="dropdown-menu" ref="menu">
<ul class="list-unstyled">
<ul class="list-unstyled">
<li>
<a class=" dropdown-item" href="#3">3</a>
</li>
<li>
<a class=" dropdown-item" href="#4">4</a>
</li>
Expand Down Expand Up @@ -5699,9 +5663,6 @@ exports[`ClayPagination should render the default markup 1`] = `
<div class="dropdown-menu" ref="menu">
<ul class="list-unstyled">
<ul class="list-unstyled">
<li>
<a class=" dropdown-item" href="#3">3</a>
</li>
<li>
<a class=" dropdown-item" href="#4">4</a>
</li>
Expand Down

0 comments on commit 5fb382f

Please sign in to comment.