Skip to content

Commit 685139d

Browse files
authored
Merge pull request #1497 from IgniteUI/vNext
Merge vNext into Master
2 parents 0b592c8 + ef2bd26 commit 685139d

File tree

204 files changed

+14537
-7074
lines changed

Some content is hidden

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

204 files changed

+14537
-7074
lines changed

angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"build": {
1212
"builder": "@angular-devkit/build-angular:browser",
1313
"options": {
14-
"vendorSourceMap": false,
14+
"sourceMap": false,
1515
"outputPath": "dist",
1616
"index": "src/index.html",
1717
"main": "src/main.ts",

live-editing/configs/BadgeConfigGenerator.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ import { IgxAvatarModule, IgxBadgeModule, IgxListModule } from "igniteui-angular
33
import { BadgeSample1Component } from "../../src/app/data-display/badge/badge-sample-1/badge-sample-1.component";
44
import { BadgeSample2Component } from "../../src/app/data-display/badge/badge-sample-2/badge-sample-2.component";
55
import { BadgeSample3Component } from "../../src/app/data-display/badge/badge-sample-3/badge-sample-3.component";
6+
import {
7+
BadgeStylingSampleComponent
8+
} from "../../src/app/data-display/badge/badge-styling-sample/badge-styling-sample.component";
69
import { AppModuleConfig } from "./core/AppModuleConfig";
710
import { Config } from "./core/Config";
811
import { IConfigGenerator } from "./core/IConfigGenerator";
@@ -47,6 +50,17 @@ export class BadgeConfigGenerator implements IConfigGenerator {
4750
shortenComponentPathBy: "/data-display/badge/"
4851
}));
4952

53+
configs.push(new Config({
54+
component: BadgeStylingSampleComponent,
55+
additionalFiles: ["src/app/data-display/badge/model/member.model.ts"],
56+
appModuleConfig: new AppModuleConfig({
57+
imports: [IgxBadgeModule, IgxListModule, BadgeStylingSampleComponent],
58+
ngDeclarations: [BadgeStylingSampleComponent],
59+
ngImports: [IgxBadgeModule, IgxListModule]
60+
}),
61+
shortenComponentPathBy: "/data-display/badge/"
62+
}));
63+
5064
return configs;
5165
}
5266
}

live-editing/configs/CalendarConfigGenerator.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { CalendarSample7Component } from "../../src/app/scheduling/calendar/cale
1111
import { CalendarStylingSample } from "../../src/app/scheduling/calendar/calendar-styling-sample/calendar-styling-sample.component";
1212
import { CalendarViewsComponent } from "../../src/app/scheduling/calendar/calendar-views/calendar-views.component";
1313
import { CalendarComponent } from "../../src/app/scheduling/calendar/calendar.component";
14+
import { CalendarMultiViewComponent } from "../../src/app/scheduling/calendar/multiview/multiview.component";
1415
import { AppModuleConfig } from "./core/AppModuleConfig";
1516
import { Config } from "./core/Config";
1617
import { IConfigGenerator } from "./core/IConfigGenerator";
@@ -119,6 +120,16 @@ export class CalendarConfigGenerator implements IConfigGenerator {
119120
shortenComponentPathBy: "/scheduling/calendar/"
120121
}));
121122

123+
configs.push(new Config({
124+
component: CalendarMultiViewComponent,
125+
appModuleConfig: new AppModuleConfig({
126+
imports: [IgxCalendarModule, IgxSnackbarModule, CalendarMultiViewComponent],
127+
ngDeclarations: [CalendarMultiViewComponent],
128+
ngImports: [IgxCalendarModule, IgxSnackbarModule]
129+
}),
130+
shortenComponentPathBy: "/scheduling/calendar/"
131+
}));
132+
122133
return configs;
123134
}
124135
}

live-editing/configs/CircularProgressbarConfigGenerator.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import { IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule }
44
import { CircularIndeterminateProgressbarComponent } from "../../src/app/data-display/circular-progressbar/circular-indeterminate-progressbar/circular-indeterminate-progressbar.component";
55
import { CircularProgressbarComponent
66
} from "../../src/app/data-display/circular-progressbar/circular-progressbar.component";
7+
import {
8+
CircularStylingSampleComponent
9+
} from "../../src/app/data-display/circular-progressbar/circular-styling-sample/circular-styling-sample.component";
710
import { AppModuleConfig } from "./core/AppModuleConfig";
811
import { Config } from "./core/Config";
912
import { IConfigGenerator } from "./core/IConfigGenerator";
@@ -34,6 +37,17 @@ export class CircularProgressbarConfigGenerator implements IConfigGenerator {
3437
shortenComponentPathBy: "/data-display/circular-progressbar/"
3538
}));
3639

40+
configs.push(new Config({
41+
component: CircularStylingSampleComponent,
42+
appModuleConfig: new AppModuleConfig({
43+
imports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule,
44+
IgxRippleModule, CircularStylingSampleComponent],
45+
ngDeclarations: [CircularStylingSampleComponent],
46+
ngImports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule]
47+
}),
48+
shortenComponentPathBy: "/data-display/circular-progressbar/"
49+
}));
50+
3751
return configs;
3852
}
3953
}

live-editing/configs/ComboConfigGenerator.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { HttpClientModule } from "@angular/common/http";
2-
import { IgxComboModule, IgxSelectModule, IgxSwitchModule, IgxToastModule } from "igniteui-angular";
2+
import { IgxButtonModule, IgxCardModule, IgxComboModule, IgxSelectModule,
3+
IgxSwitchModule, IgxToastModule } from "igniteui-angular";
34
import { RemoteService } from "../../src/app/grid/services/remote.service";
5+
import { ComboBindingComponent } from "../../src/app/lists/combo/combo-binding/combo-binding.component";
46
import { ComboFeatures } from "../../src/app/lists/combo/combo-features/combo-features.component";
57
import { ComboMainComponent } from "../../src/app/lists/combo/combo-main/combo-main.component";
68
import { ComboOverlayComponent } from "../../src/app/lists/combo/combo-overlay/combo-overlay.component";
@@ -91,6 +93,17 @@ export class ComboConfigGenerator implements IConfigGenerator {
9193
component: ComboOverlayComponent
9294
}));
9395

96+
configs.push(new Config({
97+
additionalFiles: ["/src/app/lists/combo/combo-binding/cities.ts"],
98+
appModuleConfig: new AppModuleConfig({
99+
imports: [IgxComboModule, IgxButtonModule, IgxCardModule, ComboBindingComponent],
100+
ngDeclarations: [ComboBindingComponent],
101+
ngImports: [IgxComboModule, IgxButtonModule, IgxCardModule]
102+
}),
103+
component: ComboBindingComponent,
104+
shortenComponentPathBy: "/lists/combo/"
105+
}));
106+
94107
return configs;
95108
}
96109
}

live-editing/configs/DragAndDropConfigGenerator.ts

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
/* tslint:disable:object-literal-sort-keys */
2-
import { IgxDialogModule, IgxDragDirective, IgxDragDropModule, IgxDropDirective } from "igniteui-angular";
2+
import { KanbanSampleComponent } from "../../src/app/interactions/drag-drop/kanban-sample/kanban-sample.component";
3+
import {
4+
IgxDialogModule,
5+
IgxDragDirective,
6+
IgxDragDropModule,
7+
IgxDropDirective,
8+
IgxIconModule,
9+
IgxCheckboxModule,
10+
NoOpScrollStrategy,
11+
ConnectedPositioningStrategy,
12+
GlobalPositionStrategy } from "igniteui-angular";
13+
import { DragDialogSampleComponent } from "../../src/app/interactions/drag-drop/dialog-sample/drag-dialog-sample.component";
14+
import { ListReorderSampleComponent } from "../../src/app/interactions/drag-drop/list-reorder-sample/list-reorder-sample.component";
315
import { IconsSampleComponent } from "../../src/app/interactions/drag-drop/icons-sample/icons-sample.component";
16+
import { EmailSampleComponent } from "../../src/app/interactions/drag-drop/email-sample/email-sample.component";
417
import { AppModuleConfig } from "./core/AppModuleConfig";
518
import { Config } from "./core/Config";
619
import { IConfigGenerator } from "./core/IConfigGenerator";
@@ -20,6 +33,51 @@ export class DragAndDropConfigGenerator implements IConfigGenerator {
2033
shortenComponentPathBy: "/interactions/"
2134
}));
2235

36+
configs.push(new Config({
37+
component: EmailSampleComponent,
38+
appModuleConfig: new AppModuleConfig({
39+
imports: [IgxDragDirective, IgxDropDirective,
40+
IgxDragDropModule, IgxIconModule, IgxCheckboxModule, EmailSampleComponent],
41+
ngDeclarations: [EmailSampleComponent],
42+
ngImports: [IgxDragDropModule, IgxIconModule, IgxCheckboxModule]
43+
}),
44+
shortenComponentPathBy: "/interactions/"
45+
}));
46+
47+
configs.push(new Config({
48+
component: ListReorderSampleComponent,
49+
appModuleConfig: new AppModuleConfig({
50+
imports: [IgxDragDirective, IgxDropDirective,
51+
IgxDragDropModule, ListReorderSampleComponent],
52+
ngDeclarations: [ListReorderSampleComponent],
53+
ngImports: [IgxDragDropModule]
54+
}),
55+
shortenComponentPathBy: "/interactions/"
56+
}));
57+
58+
configs.push(new Config({
59+
component: DragDialogSampleComponent,
60+
appModuleConfig: new AppModuleConfig({
61+
imports: [IgxDragDirective, IgxDropDirective,
62+
IgxDragDropModule, IgxDialogModule,
63+
NoOpScrollStrategy, ConnectedPositioningStrategy,
64+
GlobalPositionStrategy,],
65+
ngDeclarations: [DragDialogSampleComponent],
66+
ngImports: [IgxDragDropModule, IgxDialogModule]
67+
}),
68+
shortenComponentPathBy: "/interactions/"
69+
}));
70+
71+
configs.push(new Config({
72+
component: KanbanSampleComponent,
73+
appModuleConfig: new AppModuleConfig({
74+
imports: [IgxDragDirective, IgxDropDirective,
75+
IgxDragDropModule, IgxDialogModule, KanbanSampleComponent],
76+
ngDeclarations: [KanbanSampleComponent],
77+
ngImports: [IgxDragDropModule]
78+
}),
79+
shortenComponentPathBy: "/interactions/"
80+
}));
2381
return configs;
2482
}
2583
}

0 commit comments

Comments
 (0)