Skip to content

Commit 9b46638

Browse files
Merge branch 'vnext' into pmoleri/improve-spa-caching
2 parents 2361ca7 + 2a49e69 commit 9b46638

22 files changed

+1958
-2762
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
export const BaseAppAngularLocaleConfig = {
2+
modules: [
3+
{ 'module': 'BrowserModule', 'import': '@angular/platform-browser' },
4+
{ 'module': 'FormsModule', 'import': '@angular/forms' },
5+
{ 'module': 'HammerModule', 'import': '@angular/platform-browser' },
6+
],
7+
providers: [
8+
{ 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' }
9+
],
10+
router: false
11+
}

live-editing/configs/BaseConfig.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ export const BaseAppConfig = {
22
modules: [
33
{ 'module': 'BrowserModule', 'import': '@angular/platform-browser' },
44
{ 'module': 'FormsModule', 'import': '@angular/forms' },
5-
{ 'module': 'HammerModule', 'import': '@angular/platform-browser' }
5+
{ 'module': 'HammerModule', 'import': '@angular/platform-browser' },
66
],
77
providers: [
8-
{ 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' }
8+
{ 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' },
9+
{ 'provider': 'provideIgniteIntl()', 'import': 'igniteui-angular' }
910
],
1011
routesConfig: {
1112
router: false

live-editing/configs/LocalizationConfigGenerator.ts

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import { IgxGridModule } from 'igniteui-angular/grids/grid';
2-
import { IgxIconModule } from 'igniteui-angular/icon';
3-
import { IgxInputGroupModule } from 'igniteui-angular/input-group';
4-
import { IgxTimePickerModule } from 'igniteui-angular/time-picker';
5-
import { IgxSelectModule } from 'igniteui-angular/select';
6-
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing'
7-
import { BaseAppConfig } from './BaseConfig';;
1+
import { Config, IConfigGenerator} from 'igniteui-live-editing'
2+
import { BaseAppConfig } from './BaseConfig';
3+
import { BaseAppAngularLocaleConfig } from './BaseConfig-AngularLocale';
4+
85
export class LocalizationConfigGenerator implements IConfigGenerator {
96
public generateConfigs(): Config[] {
107
const configs = new Array<Config>();
@@ -14,23 +11,23 @@ export class LocalizationConfigGenerator implements IConfigGenerator {
1411
component: 'LocalizationSample1Component',
1512
additionalFiles: ['/src/app/data/nwindData.ts'],
1613
additionalDependencies: ['igniteui-angular-i18n'],
17-
appConfig: BaseAppConfig
14+
appConfig: BaseAppAngularLocaleConfig
1815
}));
1916

2017
// localization sample 2
2118
configs.push(new Config({
2219
component: 'LocalizationSample2Component',
2320
additionalFiles: ['/src/app/data/nwindData.ts'],
2421
additionalDependencies: ['igniteui-angular-i18n'],
25-
appConfig: BaseAppConfig
22+
appConfig: BaseAppAngularLocaleConfig
2623
}));
2724

2825
// localization sample 3
2926
configs.push(new Config({
3027
component: 'LocalizationSample3Component',
3128
additionalFiles: ['/src/app/data/nwindData.ts'],
3229
additionalDependencies: ['igniteui-angular-i18n'],
33-
appConfig: BaseAppConfig
30+
appConfig: BaseAppAngularLocaleConfig
3431
}));
3532

3633
// localization all resources

live-editing/configs/TooltipConfigGenerator.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ export class TooltipConfigGenerator implements IConfigGenerator {
3434
configs.push(new Config({
3535
component: 'TooltipAdvancedComponent',
3636
appConfig: BaseAppConfig,
37+
additionalDependencies: ['igniteui-angular-charts', 'igniteui-angular-core'],
38+
additionalFiles: ['/src/app/interactions/tooltip/tooltip-advanced/IncomeTaxes.ts'],
3739
shortenComponentPathBy: "/interactions/tooltip/"
3840
}));
3941

0 commit comments

Comments
 (0)