From 76bb80d15951c9004db1d29282887107d179a36f Mon Sep 17 00:00:00 2001 From: Zak Timson Date: Thu, 28 Jun 2018 19:27:34 -0400 Subject: [PATCH] Fixed changing pages and stuff --- projects/ng-datatable/package.json | 2 +- projects/ng-datatable/src/lib/ng-datatable.component.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/ng-datatable/package.json b/projects/ng-datatable/package.json index 3e717b1..04d6d85 100644 --- a/projects/ng-datatable/package.json +++ b/projects/ng-datatable/package.json @@ -1,6 +1,6 @@ { "name": "@ztimson/ng-datatable", - "version": "1.7.0", + "version": "1.7.1", "homepage": "https://github.com/ztimson/ng-datatable", "license": "Apache-2.0", "author": { diff --git a/projects/ng-datatable/src/lib/ng-datatable.component.ts b/projects/ng-datatable/src/lib/ng-datatable.component.ts index fa49497..43048b5 100644 --- a/projects/ng-datatable/src/lib/ng-datatable.component.ts +++ b/projects/ng-datatable/src/lib/ng-datatable.component.ts @@ -79,9 +79,8 @@ export class NgDatatableComponent implements OnInit { } if(this.paginate && this.processedData) { - this.page = 1; - this.pageChanged.emit(this.page); this.pages = Array(Math.ceil(this.processedData.length / this.pageLength)).fill(0).map((ignore, i) => i + 1); + if(this.page > this.pages.length) this.page = this.pages.length; this.pagedData = this.processedData.filter((ignore, i) => i >= (this.page - 1) * this.pageLength && i < this.page * this.pageLength); } else { this.pagedData = this.processedData;