Skip to content

Commit 4c8fc50

Browse files
authored
Merge branch '8.2.x' into amarinov/HGrid82
2 parents 964a495 + 80011a3 commit 4c8fc50

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2072,7 +2072,7 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
20722072
* @hidden
20732073
*/
20742074
public get parentRowOutletDirective() {
2075-
return null;
2075+
return this.outletDirective;
20762076
}
20772077

20782078
/**

projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1251,14 +1251,15 @@ describe('IgxGrid - Filtering actions #grid', () => {
12511251
fix.detectChanges();
12521252

12531253
const firstMonth = calendar.querySelector('.igx-calendar__month');
1254+
const firstMonthText = (firstMonth as HTMLElement).innerText;
12541255
firstMonth.dispatchEvent(new Event('click'));
12551256
tick();
12561257
fix.detectChanges();
12571258

12581259
calendar = outlet.getElementsByClassName('igx-calendar')[0];
12591260
const month = calendar.querySelector('.igx-calendar-picker__date');
12601261

1261-
expect(month.innerHTML.trim()).toEqual('Jan');
1262+
expect(month.innerHTML.trim()).toEqual(firstMonthText);
12621263
}));
12631264

12641265
it('Should correctly select year from year view datepicker/calendar component', fakeAsync(() => {

projects/igniteui-angular/src/lib/grids/grid/grid.groupby.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2565,6 +2565,7 @@ describe('IgxGrid - GroupBy #grid', () => {
25652565
it('should apply custom comparer function when grouping by dragging a column into the group area', async () => {
25662566
const fix = TestBed.createComponent(GroupableGridComponent);
25672567
const grid = fix.componentInstance.instance;
2568+
const year = new Date().getFullYear().toString();
25682569
fix.detectChanges();
25692570
await wait();
25702571

@@ -2604,7 +2605,7 @@ describe('IgxGrid - GroupBy #grid', () => {
26042605
expect(grid.groupsRecords.length).toEqual(2);
26052606
expect(grid.groupsRecords[1].records.length).toEqual(6);
26062607
for (let i = 0; i < grid.groupsRecords[1].records.length; i++) {
2607-
expect(grid.groupsRecords[1].records[i].ReleaseDate.getFullYear().toString()).toEqual('2019');
2608+
expect(grid.groupsRecords[1].records[i].ReleaseDate.getFullYear().toString()).toEqual(year);
26082609
}
26092610
});
26102611

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -446,13 +446,6 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseCompone
446446
return this.rootGrid._outletDirective;
447447
}
448448

449-
/**
450-
* @hidden
451-
*/
452-
public get parentRowOutletDirective() {
453-
return this === this.rootGrid ? null : this.rootGrid.rowEditingOutletDirective;
454-
}
455-
456449
/**
457450
* @hidden
458451
*/

0 commit comments

Comments
 (0)