Skip to content

Commit ca70c58

Browse files
LipataLipata
authored
Merge branch 'master' into simeonoff/fix-9180
2 parents ef2ead1 + 2da802b commit ca70c58

File tree

223 files changed

+2617
-2336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+2617
-2336
lines changed

‎.eslintrc.json‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,17 @@
2222
],
2323
"rules": {
2424
"no-shadow": "off",
25-
"@typescript-eslint/no-shadow": ["error"],
25+
"@typescript-eslint/no-shadow": [
26+
"error"
27+
],
2628
"no-unused-vars": "off",
27-
"@typescript-eslint/no-unused-vars": ["warn", { "varsIgnorePattern": "_" , "argsIgnorePattern": "^_"}],
29+
"@typescript-eslint/no-unused-vars": [
30+
"warn",
31+
{
32+
"varsIgnorePattern": "_",
33+
"argsIgnorePattern": "^_"
34+
}
35+
],
2836
"@typescript-eslint/consistent-type-definitions": "error",
2937
"@typescript-eslint/dot-notation": "off",
3038
"@typescript-eslint/explicit-member-accessibility": [
@@ -40,7 +48,9 @@
4048
"error",
4149
{
4250
"selector": "enumMember",
43-
"format": ["PascalCase"]
51+
"format": [
52+
"PascalCase"
53+
]
4454
}
4555
],
4656
"brace-style": [

‎package-lock.json‎

Lines changed: 1196 additions & 639 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@
4646
},
4747
"private": true,
4848
"dependencies": {
49-
"@angular/animations": "^11.2.0",
50-
"@angular/common": "^11.2.0",
51-
"@angular/compiler": "^11.2.0",
52-
"@angular/core": "^11.2.0",
53-
"@angular/forms": "^11.2.0",
54-
"@angular/platform-browser": "^11.2.0",
55-
"@angular/platform-browser-dynamic": "^11.2.0",
56-
"@angular/router": "^11.2.0",
49+
"@angular/animations": "^11.2.5",
50+
"@angular/common": "^11.2.5",
51+
"@angular/compiler": "^11.2.5",
52+
"@angular/core": "^11.2.5",
53+
"@angular/forms": "^11.2.5",
54+
"@angular/platform-browser": "^11.2.5",
55+
"@angular/platform-browser-dynamic": "^11.2.5",
56+
"@angular/router": "^11.2.5",
5757
"@igniteui/material-icons-extended": "^2.4.0",
5858
"@types/hammerjs": "^2.0.36",
5959
"@types/source-map": "0.5.2",
@@ -64,31 +64,31 @@
6464
"jszip": "^3.6.0",
6565
"lodash.mergewith": "^4.6.2",
6666
"resize-observer-polyfill": "^1.5.1",
67-
"rxjs": "^6.6.3",
67+
"rxjs": "^6.6.6",
6868
"setimmediate": "^1.0.5",
6969
"tslib": "^2.0.0",
7070
"uuid": "^8.3.0",
7171
"web-animations-js": "^2.3.2",
7272
"zone.js": "~0.10.3"
7373
},
7474
"devDependencies": {
75-
"@angular-devkit/build-angular": "~0.1102.0",
76-
"@angular-devkit/schematics": "^11.2.0",
77-
"@angular-eslint/builder": "1.1.0",
78-
"@angular-eslint/eslint-plugin": "1.1.0",
79-
"@angular-eslint/eslint-plugin-template": "1.1.0",
80-
"@angular-eslint/schematics": "^1.2.0",
81-
"@angular-eslint/template-parser": "1.1.0",
82-
"@angular/cli": "~11.2.0",
83-
"@angular/compiler-cli": "^11.2.0",
84-
"@angular/language-service": "^11.2.0",
75+
"@angular-devkit/build-angular": "~0.1102.4",
76+
"@angular-devkit/schematics": "^11.2.4",
77+
"@angular-eslint/builder": "^2.0.0",
78+
"@angular-eslint/eslint-plugin": "^2.0.0",
79+
"@angular-eslint/eslint-plugin-template": "^2.0.0",
80+
"@angular-eslint/schematics": "^2.0.1",
81+
"@angular-eslint/template-parser": "^2.0.0",
82+
"@angular/cli": "~11.2.4",
83+
"@angular/compiler-cli": "^11.2.5",
84+
"@angular/language-service": "^11.2.5",
8585
"@angularclass/hmr": "^2.1.3",
8686
"@types/jasmine": "^3.3.16",
8787
"@types/jasminewd2": "^2.0.8",
8888
"@types/node": "^12.20.0",
8989
"@types/webpack-env": "^1.15.2",
90-
"@typescript-eslint/eslint-plugin": "4.3.0",
91-
"@typescript-eslint/parser": "4.3.0",
90+
"@typescript-eslint/eslint-plugin": "4.16.1",
91+
"@typescript-eslint/parser": "4.16.1",
9292
"browser-sync": "^2.26.12",
9393
"codelyzer": "^6.0.0",
9494
"coveralls": "^3.1.0",

‎projects/igniteui-angular/karma.azure.grid.conf.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = function (config) {
2424
},
2525
tagPrefix: '#',
2626
tags: 'grid',
27-
skipTags: 'perf'
27+
skipTags: 'perf,ivy' // TODO: Remove ivy skip, once Azure run is updated
2828
},
2929
port: 9876,
3030
colors: true,

‎projects/igniteui-angular/migrations/common/ServerHost.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export class ServerHost implements ts.server.ServerHost {
150150
// return ts.sys.exit(exitCode);
151151
}
152152

153-
public setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): any {
153+
public setTimeout(callback: (...argsv: any[]) => void, ms: number, ...args: any[]): any {
154154
throw new Error('Method "setTimeout" not implemented.');
155155
// return ts.sys.setTimeout(callback, ms, ...args);
156156
}
@@ -175,7 +175,7 @@ export class ServerHost implements ts.server.ServerHost {
175175
// return ts.sys.base64encode(input);
176176
}
177177

178-
public setImmediate(callback: (...args: any[]) => void, ...args: any[]): any {
178+
public setImmediate(callback: (...argsv: any[]) => void, ...args: any[]): any {
179179
throw new Error('Method "setImmediate" not implemented.');
180180
// return setImmediate(callback, ...args);
181181
}

‎projects/igniteui-angular/migrations/update-12_0_0/changes/outputs.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"$schema": "../../common/schema/binding.schema.json",
3+
"changes": [
4+
{
5+
"name": "onColumnChange",
6+
"replaceWith": "columnChange",
7+
"owner": {
8+
"selector": "igx-column",
9+
"type": "component"
10+
}
11+
}
12+
]
13+
}

‎projects/igniteui-angular/migrations/update-12_0_0/index.spec.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,31 @@ $theme: igx-avatar-theme(
5656
$color: black,
5757
$border-radius: 14px
5858
);
59+
`
60+
);
61+
});
62+
63+
it('should update onColumnChange', async () => {
64+
appTree.create(
65+
`/testSrc/appPrefix/component/test.component.html`,
66+
`
67+
<igx-grid>
68+
<igx-column (onColumnChange)="columnChanged()"></igx-column>
69+
</igx-grid>
70+
`
71+
);
72+
73+
const tree = await runner
74+
.runSchematicAsync(migrationName, {}, appTree)
75+
.toPromise();
76+
77+
expect(
78+
tree.readContent('/testSrc/appPrefix/component/test.component.html')
79+
).toEqual(
80+
`
81+
<igx-grid>
82+
<igx-column (columnChange)="columnChanged()"></igx-column>
83+
</igx-grid>
5984
`
6085
);
6186
});

‎projects/igniteui-angular/migrations/update-8_2_0/index.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('Update 8.2.0', () => {
2828
it('should update Excel Style Filtering template selectors', async () => {
2929
appTree.create(
3030
'/testSrc/appPrefix/component/custom.component.html',
31-
`<igx-grid [data]="data" height="500px" [autoGenerate]="true" [allowFiltering]='true' [filterMode]="'excelStyleFilter'">
31+
`<igx-grid [data]="data" height="500px" [autoGenerate]="true" [allowFiltering]="true" [filterMode]="'excelStyleFilter'">
3232
<ng-template igxExcelStyleSortingTemplate><div class="esf-custom-sorting">Sorting Template</div></ng-template>
3333
<ng-template igxExcelStyleHidingTemplate><div class="esf-custom-hiding">Hiding Template</div></ng-template>
3434
<ng-template igxExcelStyleMovingTemplate><div class="esf-custom-moving">Moving Template</div></ng-template>
@@ -39,7 +39,7 @@ describe('Update 8.2.0', () => {
3939
.toPromise();
4040
expect(tree.readContent('/testSrc/appPrefix/component/custom.component.html'))
4141
.toEqual(
42-
`<igx-grid [data]="data" height="500px" [autoGenerate]="true" [allowFiltering]='true' [filterMode]="'excelStyleFilter'">
42+
`<igx-grid [data]="data" height="500px" [autoGenerate]="true" [allowFiltering]="true" [filterMode]="'excelStyleFilter'">
4343
<ng-template igxExcelStyleSorting><div class="esf-custom-sorting">Sorting Template</div></ng-template>
4444
<ng-template igxExcelStyleHiding><div class="esf-custom-hiding">Hiding Template</div></ng-template>
4545
<ng-template igxExcelStyleMoving><div class="esf-custom-moving">Moving Template</div></ng-template>

‎projects/igniteui-angular/src/lib/banner/banner.component.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, OnInit, ViewChild, DebugElement } from '@angular/core';
1+
import { Component, ViewChild, DebugElement } from '@angular/core';
22
import { TestBed, ComponentFixture, tick, fakeAsync, waitForAsync } from '@angular/core/testing';
33
import { By } from '@angular/platform-browser';
44
import { IgxAvatarModule } from '../avatar/avatar.component';
@@ -487,7 +487,7 @@ describe('igxBanner', () => {
487487
expect(banner.elementRef.nativeElement.style.display).toEqual('block');
488488
expect(banner.collapsed).toBeFalsy();
489489
banner.toggle();
490-
tick(100);
490+
tick();
491491
// Banner is collapsING, display is 'block';
492492
expect(banner.elementRef.nativeElement.style.display).toEqual('block');
493493
tick();
@@ -566,7 +566,7 @@ export class IgxBannerSampleComponent {
566566
<igx-card-header class="compact">
567567
<igx-avatar
568568
src="https://www.infragistics.com/angular-demos/assets/images/card/avatars/brad_stanley.jpg"
569-
roundShape="true">
569+
[roundShape]="true">
570570
</igx-avatar>
571571
<div class="igx-card-header__tgroup">
572572
<h3 class="igx-card-header__title--small">Brad Stanley</h3>

‎projects/igniteui-angular/src/lib/calendar/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Instantiate a calendar component in single selection mode displaying the current
4242
A range selection calendar with first day of week set to Monday and an event
4343
handler when selection is done.
4444
```html
45-
<igx-calendar weekStart="1" selection="range" (selected)="eventHandler($event)"></igx-calendar>
45+
<igx-calendar [weekStart]="1" selection="range" (selected)="eventHandler($event)"></igx-calendar>
4646
```
4747

4848
A multiple selection calendar with different locale and templating for the subheader.

0 commit comments

Comments
 (0)