Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 20:16:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix test dont turn single pages into ...

Browse Source
This commit is contained in:
barisusakli
2016-11-24 22:56:42 +03:00
parent dde32744b7
commit d4638ffc15
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pagination.js
View File

@@ -46,7 +46,9 @@ pagination.create = function (currentPage, pageCount, queryObj) {
}); });
for (i = pages.length - 1; i > 0; --i) { for (i = pages.length - 1; i > 0; --i) {
if (pages[i - 1].page !== pages[i].page - 1) { if (pages[i].page - 2 === pages[i - 1].page) {
pages.splice(i, 0, {page: pages[i].page - 1, active: false, qs: qs.stringify(queryObj)});
} else if (pages[i].page - 1 !== pages[i - 1].page) {
pages.splice(i, 0, {separator: true}); pages.splice(i, 0, {separator: true});
} }
} }

4
test/pagination.js
View File

@@ -18,8 +18,8 @@ describe('Pagination', function () {
it('should create pagination for 10 pages', function (done) { it('should create pagination for 10 pages', function (done) {
var data = pagination.create(2, 10); var data = pagination.create(2, 10);
// [1, (2), 3, 4, separator, 9, 10] // [1, (2), 3, 4, 5, separator, 9, 10]
assert.equal(data.pages.length, 7); assert.equal(data.pages.length, 8);
assert.equal(data.rel.length, 2); assert.equal(data.rel.length, 2);
assert.equal(data.pageCount, 10); assert.equal(data.pageCount, 10);
assert.equal(data.prev.page, 1); assert.equal(data.prev.page, 1);