Skip to content

Commit c50b8ae

Browse files
authored
Merge branch '9.0.x' into SIvanova/sassdoc-review
2 parents 3b5d4c5 + d414e9b commit c50b8ae

File tree

8 files changed

+1654
-2211
lines changed

8 files changed

+1654
-2211
lines changed

projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts

Lines changed: 156 additions & 248 deletions
Large diffs are not rendered by default.

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

Lines changed: 700 additions & 1047 deletions
Large diffs are not rendered by default.

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

Lines changed: 331 additions & 560 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import { SortingDirection } from '../../data-operations/sorting-expression.inter
66
import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec';
77
import { configureTestSuite } from '../../test-utils/configure-suite';
88
import { IgxStringFilteringOperand } from '../../data-operations/filtering-condition';
9-
import { ColumnEditablePropertyTestComponent } from './cell.spec';
109
import { GridFunctions } from '../../test-utils/grid-functions.spec';
1110
import {
1211
CellEditingTestComponent, CellEditingScrollTestComponent,
13-
SelectionWithTransactionsComponent
12+
SelectionWithTransactionsComponent,
13+
ColumnEditablePropertyTestComponent
1414
} from '../../test-utils/grid-samples.spec';
1515

1616
const DEBOUNCETIME = 30;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1906,7 +1906,7 @@ describe('IgxGrid - Row Editing #grid', () => {
19061906
setupGridScrollDetection(fix, grid);
19071907
fix.detectChanges();
19081908

1909-
fix.componentInstance.columns = fix.componentInstance.generateCols(100, 50);
1909+
fix.componentInstance.columns = fix.componentInstance.generateCols(100);
19101910
fix.componentInstance.data = fix.componentInstance.generateData(100);
19111911

19121912
fix.detectChanges();

0 commit comments

Comments
 (0)