Skip to content

Commit c1e6bed

Browse files
authored
Merge branch 'vNext' into bpachilova/grid-validation-sample-fix-3177
2 parents 2b8baa0 + 7612eda commit c1e6bed

3 files changed

Lines changed: 53 additions & 53 deletions

File tree

package-lock.json

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

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
"domino": "^2.1.4",
6464
"file-saver": "^2.0.2",
6565
"hammerjs": "^2.0.8",
66-
"igniteui-angular": "^15.0.0-rc.0",
66+
"igniteui-angular": "^15.0.0",
6767
"igniteui-angular-charts": "^14.0.0",
6868
"igniteui-angular-core": "^14.0.0",
6969
"igniteui-angular-i18n": "^14.2.0",
7070
"igniteui-dockmanager": "^1.8.0",
71-
"igniteui-live-editing": "^2.0.4",
72-
"igniteui-theming": "^1.1.3",
71+
"igniteui-live-editing": "^2.0.5",
72+
"igniteui-theming": "^1.1.4",
7373
"igniteui-webcomponents": "^3.4.0",
7474
"immediate": "^3.2.3",
7575
"intl": "^1.2.5",
@@ -90,7 +90,7 @@
9090
"@angular/cli": "^15.0.0",
9191
"@angular/compiler-cli": "^15.0.0",
9292
"@angular/language-service": "^15.0.0",
93-
"@igniteui/angular-schematics": "^14.0.1001",
93+
"@igniteui/angular-schematics": "15.0.1100",
9494
"@juggle/resize-observer": "^3.3.1",
9595
"@types/jasmine": "^3.10.2",
9696
"@types/jasminewd2": "^2.0.9",

src/app/scheduling/monthpicker/monthpicker-sample-3/monthpicker-sample-3.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import { registerLocaleData } from '@angular/common';
12
import { Component, OnInit } from '@angular/core';
23
import { IFormattingOptions } from 'igniteui-angular';
34
import localeDE from '@angular/common/locales/de';
45
import localeFR from '@angular/common/locales/fr';
6+
import localeJA from '@angular/common/locales/ja';
57
import localeAR from '@angular/common/locales/ar';
68
import localeZH from '@angular/common/locales/zh';
7-
import { registerLocaleData } from '@angular/common';
8-
99

1010
@Component({
1111
selector: 'app-monthpicker-sample-3',
@@ -21,10 +21,10 @@ export class MonthpickerSample3Component implements OnInit {
2121
public locales = ['en', 'de', 'fr', 'ar', 'zh'];
2222
public locale = 'en';
2323

24-
2524
public ngOnInit(): void {
2625
registerLocaleData(localeDE);
2726
registerLocaleData(localeFR);
27+
registerLocaleData(localeJA);
2828
registerLocaleData(localeAR);
2929
registerLocaleData(localeZH);
3030
}

0 commit comments

Comments
 (0)