From d3c99594faea30c50eb6d47dd209302fd090d8c5 Mon Sep 17 00:00:00 2001 From: vvo Date: Fri, 25 Sep 2015 13:19:35 +0200 Subject: [PATCH] fix(pagination): handle cases where maxPages is low fixes #100 --- components/Pagination/Paginator.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/Pagination/Paginator.js b/components/Pagination/Paginator.js index 30d5ee053e..10bf77afa6 100644 --- a/components/Pagination/Paginator.js +++ b/components/Pagination/Paginator.js @@ -10,9 +10,9 @@ class Paginator { pages() { var current = this.currentPage; var padding = this.padding; - var paddingLeft = this.calculatePaddingLeft(current, padding, this.total); - var paddingRight = Math.min(2 * padding + 1, this.total) - paddingLeft; - var first = current - paddingLeft; + var paddingLeft = Math.min(this.calculatePaddingLeft(current, padding, this.total), this.total); + var paddingRight = Math.max(Math.min(2 * padding + 1, this.total) - paddingLeft, 1); + var first = Math.max(current - paddingLeft, 0); var last = current + paddingRight; return range(first, last); }