Merge pull request #38 from rajivnarayana/master

Fix getArrayPages when limit is more than no of pages
expressjs · Jul 25, 2017 · 53c3a84 · 53c3a84
2 parents 3d28d8b + de43cd8
commit 53c3a84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -69,7 +69,7 @@ exports.getArrayPages = function(req) {
 
     if (limit > 0) {
       var end = Math.min(Math.max(currentPage + Math.floor(limit / 2), limit), pageCount);
-      var start = (currentPage < (limit - 1)) ? 1 : (end - limit) + 1;
+      var start = Math.max(1, (currentPage < (limit - 1)) ? 1 : (end - limit) + 1);
 
       var pages = [];
       for (var i = start; i <= end; i++) {

diff --git a/test/index-test.js b/test/index-test.js
@@ -250,7 +250,8 @@ describe('paginate', function () {
     })
 
     it('it should contain correct page numbers and page urls', function () {
-      pages.forEach(function (p, i) {
+      //Limit is more than total pages
+      paginate.getArrayPages(this.req)(4,3,3).forEach(function (p, i) {
         // index from 1
         var idx = i + 1;
         p.number.should.equal(idx);