Skip to content

Commit 8fdbcd3

Browse files
authored
Merge branch 'vNext' into sivanova/input-group-samples
2 parents 35bc0d8 + 7ca98ba commit 8fdbcd3

File tree

39 files changed

+1256
-2903
lines changed

39 files changed

+1256
-2903
lines changed

live-editing/configs/CircularProgressbarConfigGenerator.ts

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
/* tslint:disable:object-literal-sort-keys */
22
import { IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule } from "igniteui-angular";
3+
import {
4+
CircularDynamicSampleComponent
5+
} from "../../src/app/data-display/circular-progressbar/circular-dynamic-sample/circular-dynamic-sample.component";
36
// tslint:disable-next-line:max-line-length
47
import { CircularIndeterminateProgressbarComponent } from "../../src/app/data-display/circular-progressbar/circular-indeterminate-progressbar/circular-indeterminate-progressbar.component";
58
import { CircularProgressbarComponent
@@ -18,32 +21,48 @@ export class CircularProgressbarConfigGenerator implements IConfigGenerator {
1821
configs.push(new Config({
1922
component: CircularProgressbarComponent,
2023
appModuleConfig: new AppModuleConfig({
21-
imports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule,
22-
IgxRippleModule, CircularProgressbarComponent],
24+
imports: [IgxProgressBarModule, CircularProgressbarComponent],
2325
ngDeclarations: [CircularProgressbarComponent],
24-
ngImports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule]
26+
ngImports: [IgxProgressBarModule]
2527
}),
2628
shortenComponentPathBy: "/data-display/"
2729
}));
2830

2931
configs.push(new Config({
3032
component: CircularIndeterminateProgressbarComponent,
3133
appModuleConfig: new AppModuleConfig({
32-
imports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule,
33-
IgxRippleModule, CircularIndeterminateProgressbarComponent],
34+
imports: [IgxProgressBarModule, CircularIndeterminateProgressbarComponent],
3435
ngDeclarations: [CircularIndeterminateProgressbarComponent],
35-
ngImports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule]
36+
ngImports: [IgxProgressBarModule]
3637
}),
3738
shortenComponentPathBy: "/data-display/circular-progressbar/"
3839
}));
3940

41+
configs.push(new Config({
42+
component: CircularDynamicSampleComponent,
43+
appModuleConfig: new AppModuleConfig({
44+
imports: [
45+
IgxButtonModule,
46+
IgxIconModule,
47+
IgxProgressBarModule,
48+
IgxRippleModule,
49+
CircularDynamicSampleComponent],
50+
ngDeclarations: [CircularDynamicSampleComponent],
51+
ngImports: [
52+
IgxButtonModule,
53+
IgxIconModule,
54+
IgxProgressBarModule,
55+
IgxRippleModule]
56+
}),
57+
shortenComponentPathBy: "/data-display/"
58+
}));
59+
4060
configs.push(new Config({
4161
component: CircularStylingSampleComponent,
4262
appModuleConfig: new AppModuleConfig({
43-
imports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule,
44-
IgxRippleModule, CircularStylingSampleComponent],
63+
imports: [IgxProgressBarModule, CircularStylingSampleComponent],
4564
ngDeclarations: [CircularStylingSampleComponent],
46-
ngImports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule]
65+
ngImports: [IgxProgressBarModule]
4766
}),
4867
shortenComponentPathBy: "/data-display/circular-progressbar/"
4968
}));

live-editing/configs/LinearProgressbarConfigGenerator.ts

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// tslint:disable:object-literal-sort-keys
22
// tslint:disable:max-line-length
33
import { IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule } from "igniteui-angular";
4+
import {
5+
LinearDynamicSampleComponent
6+
} from "../../src/app/data-display/linear-progressbar/linear-dynamic-sample/linear-dynamic-sample.component";
47
import { LinearProgressbarSample1Component
58
} from "../../src/app/data-display/linear-progressbar/linear-progressbar-sample-1/linear-progressbar-sample-1.component";
69
import { LinearProgressbarSample2Component
@@ -18,43 +21,60 @@ export class LinearProgressbarConfigGenerator implements IConfigGenerator {
1821
configs.push(new Config({
1922
component: LinearProgressbarComponent,
2023
appModuleConfig: new AppModuleConfig({
21-
imports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule,
22-
LinearProgressbarComponent],
24+
imports: [IgxProgressBarModule, LinearProgressbarComponent],
2325
ngDeclarations: [LinearProgressbarComponent],
24-
ngImports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule]
26+
ngImports: [IgxProgressBarModule]
2527
}),
2628
shortenComponentPathBy: "/data-display/"
2729
}));
2830

31+
configs.push(new Config({
32+
component: LinearDynamicSampleComponent,
33+
appModuleConfig: new AppModuleConfig({
34+
imports: [
35+
IgxButtonModule,
36+
IgxIconModule,
37+
IgxProgressBarModule,
38+
IgxRippleModule,
39+
LinearDynamicSampleComponent
40+
],
41+
ngDeclarations: [LinearDynamicSampleComponent],
42+
ngImports: [
43+
IgxButtonModule,
44+
IgxIconModule,
45+
IgxProgressBarModule,
46+
IgxRippleModule
47+
]
48+
}),
49+
shortenComponentPathBy: "/data-display/linear-progressbar/"
50+
}));
51+
2952
configs.push(new Config({
3053
component: LinearProgressbarSample1Component,
3154
appModuleConfig: new AppModuleConfig({
32-
imports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule,
33-
LinearProgressbarSample1Component],
55+
imports: [IgxProgressBarModule, LinearProgressbarSample1Component],
3456
ngDeclarations: [LinearProgressbarSample1Component],
35-
ngImports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule]
57+
ngImports: [IgxProgressBarModule]
3658
}),
3759
shortenComponentPathBy: "/data-display/linear-progressbar/"
3860
}));
3961

4062
configs.push(new Config({
4163
component: LinearProgressbarSample2Component,
4264
appModuleConfig: new AppModuleConfig({
43-
imports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule,
44-
LinearProgressbarSample2Component],
65+
imports: [IgxProgressBarModule, LinearProgressbarSample2Component],
4566
ngDeclarations: [LinearProgressbarSample2Component],
46-
ngImports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule]
67+
ngImports: [IgxProgressBarModule]
4768
}),
4869
shortenComponentPathBy: "/data-display/linear-progressbar/"
4970
}));
5071

5172
configs.push(new Config({
5273
component: LinearProgressbarStylingComponent,
5374
appModuleConfig: new AppModuleConfig({
54-
imports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule,
55-
LinearProgressbarStylingComponent],
75+
imports: [IgxProgressBarModule, LinearProgressbarStylingComponent],
5676
ngDeclarations: [LinearProgressbarStylingComponent],
57-
ngImports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule]
77+
ngImports: [IgxProgressBarModule]
5878
}),
5979
shortenComponentPathBy: "/data-display/linear-progressbar"
6080
}));

0 commit comments

Comments
 (0)