Merge branch 'master' into fix/null

splincode · splincode · commit 135b10de4c03 · 2020-03-30T09:21:39.000+03:00
# Conflicts:
#	projects/table-builder/package.json
diff --git a/projects/table-builder/package.json b/projects/table-builder/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@angular-ru/ng-table-builder",
-    "version": "0.32.0",
+    "version": "0.33.0",
     "license": "MIT",
     "bugs": {
         "url": "https://github.com/Angular-RU/ng-table-builder/issues"
diff --git a/projects/table-builder/src/lib/table/services/sortable/sortable.service.ts b/projects/table-builder/src/lib/table/services/sortable/sortable.service.ts
@@ -42,7 +42,6 @@ export class SortableService {
 
     public setDefinition(definition: KeyMap<string>): void {
         this.definition = this.empty ? (definition as KeyMap<SortOrderType>) || {} : this.definition;
-        this.triggerOnChanges();
     }
 
     public setSkipSort(skipInternalSort: boolean): void {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@angular-ru/ng-table-builder",`
`3`		`- "version": "0.32.0",`
	`3`	`+ "version": "0.33.0",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"bugs": {`
`6`	`6`	`"url": "https://github.com/Angular-RU/ng-table-builder/issues"`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ export class SortableService {`
`42`	`42`
`43`	`43`	`public setDefinition(definition: KeyMap<string>): void {`
`44`	`44`	`this.definition = this.empty ? (definition as KeyMap<SortOrderType>) \|\| {} : this.definition;`
`45`		`- this.triggerOnChanges();`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`public setSkipSort(skipInternalSort: boolean): void {`