Skip to content

Commit 58e6bfa

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Fix lint errors.
1 parent 5e1b702 commit 58e6bfa

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2505,10 +2505,10 @@ export abstract class IgxGridBaseDirective implements GridType,
25052505
* ```
25062506
*/
25072507
@Input()
2508-
get mergeStrategy() {
2508+
public get mergeStrategy() {
25092509
return this._mergeStrategy;
25102510
}
2511-
set mergeStrategy(value) {
2511+
public set mergeStrategy(value) {
25122512
this._mergeStrategy = value;
25132513
}
25142514

@@ -3974,7 +3974,7 @@ export abstract class IgxGridBaseDirective implements GridType,
39743974
public get columnsToMerge() : ColumnType[] {
39753975
return this.visibleColumns.filter(
39763976
x => x.merge && (this.cellMergeMode ==='always' ||
3977-
(this.cellMergeMode === 'onSort' && !!this.sortingExpressions.find( x=> x.fieldName === x.fieldName)))
3977+
(this.cellMergeMode === 'onSort' && !!this.sortingExpressions.find( y => y.fieldName === x.field)))
39783978
);
39793979
}
39803980

@@ -4058,7 +4058,7 @@ export abstract class IgxGridBaseDirective implements GridType,
40584058
const columnToMerge = this.visibleColumns.filter(
40594059
x => x.merge && (this.cellMergeMode ==='always' ||
40604060
(this.cellMergeMode === 'onSort' && !!this.sortingExpressions
4061-
.find( x=> x.fieldName === x.fieldName)))
4061+
.find(y => y.fieldName === x.field)))
40624062
);
40634063
return columnToMerge.length > 0;
40644064
}

0 commit comments

Comments
 (0)