From 0fb93f723e87077c67c66ab7ce28fe65afe1ed59 Mon Sep 17 00:00:00 2001 From: Zak Timson Date: Wed, 27 Jun 2018 14:05:14 -0400 Subject: [PATCH] Fixed initial sort happening too soon --- projects/ng-datatable/package.json | 2 +- projects/ng-datatable/src/lib/ng-datatable.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/ng-datatable/package.json b/projects/ng-datatable/package.json index 449808b..26ebc5c 100644 --- a/projects/ng-datatable/package.json +++ b/projects/ng-datatable/package.json @@ -1,6 +1,6 @@ { "name": "@ztimson/ng-datatable", - "version": "1.6.5", + "version": "1.6.6", "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 ee6b824..6de970b 100644 --- a/projects/ng-datatable/src/lib/ng-datatable.component.ts +++ b/projects/ng-datatable/src/lib/ng-datatable.component.ts @@ -62,7 +62,7 @@ export class NgDatatableComponent implements OnInit { this.clearSelected(); this.processedData = this._data; this.filters.forEach(f => this.processedData = this.processedData.filter(f)); - if(this.sortedColumn != null) { + if(this.sortedColumn != null && this.processedData) { if (this.columns[this.sortedColumn].sortFn) { this.processedData = this.processedData.sort(this.columns[this.sortedColumn].sortFn); } else {