Skip to content

Commit

Permalink
Merge pull request #1497 from IgniteUI/vNext
Browse files Browse the repository at this point in the history
Merge vNext into Master
  • Loading branch information
zdrawku authored Sep 26, 2019
2 parents 0b592c8 + ef2bd26 commit 685139d
Show file tree
Hide file tree
Showing 204 changed files with 14,537 additions and 7,074 deletions.
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"vendorSourceMap": false,
"sourceMap": false,
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
Expand Down
14 changes: 14 additions & 0 deletions live-editing/configs/BadgeConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import { IgxAvatarModule, IgxBadgeModule, IgxListModule } from "igniteui-angular
import { BadgeSample1Component } from "../../src/app/data-display/badge/badge-sample-1/badge-sample-1.component";
import { BadgeSample2Component } from "../../src/app/data-display/badge/badge-sample-2/badge-sample-2.component";
import { BadgeSample3Component } from "../../src/app/data-display/badge/badge-sample-3/badge-sample-3.component";
import {
BadgeStylingSampleComponent
} from "../../src/app/data-display/badge/badge-styling-sample/badge-styling-sample.component";
import { AppModuleConfig } from "./core/AppModuleConfig";
import { Config } from "./core/Config";
import { IConfigGenerator } from "./core/IConfigGenerator";
Expand Down Expand Up @@ -47,6 +50,17 @@ export class BadgeConfigGenerator implements IConfigGenerator {
shortenComponentPathBy: "/data-display/badge/"
}));

configs.push(new Config({
component: BadgeStylingSampleComponent,
additionalFiles: ["src/app/data-display/badge/model/member.model.ts"],
appModuleConfig: new AppModuleConfig({
imports: [IgxBadgeModule, IgxListModule, BadgeStylingSampleComponent],
ngDeclarations: [BadgeStylingSampleComponent],
ngImports: [IgxBadgeModule, IgxListModule]
}),
shortenComponentPathBy: "/data-display/badge/"
}));

return configs;
}
}
11 changes: 11 additions & 0 deletions live-editing/configs/CalendarConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { CalendarSample7Component } from "../../src/app/scheduling/calendar/cale
import { CalendarStylingSample } from "../../src/app/scheduling/calendar/calendar-styling-sample/calendar-styling-sample.component";
import { CalendarViewsComponent } from "../../src/app/scheduling/calendar/calendar-views/calendar-views.component";
import { CalendarComponent } from "../../src/app/scheduling/calendar/calendar.component";
import { CalendarMultiViewComponent } from "../../src/app/scheduling/calendar/multiview/multiview.component";
import { AppModuleConfig } from "./core/AppModuleConfig";
import { Config } from "./core/Config";
import { IConfigGenerator } from "./core/IConfigGenerator";
Expand Down Expand Up @@ -119,6 +120,16 @@ export class CalendarConfigGenerator implements IConfigGenerator {
shortenComponentPathBy: "/scheduling/calendar/"
}));

configs.push(new Config({
component: CalendarMultiViewComponent,
appModuleConfig: new AppModuleConfig({
imports: [IgxCalendarModule, IgxSnackbarModule, CalendarMultiViewComponent],
ngDeclarations: [CalendarMultiViewComponent],
ngImports: [IgxCalendarModule, IgxSnackbarModule]
}),
shortenComponentPathBy: "/scheduling/calendar/"
}));

return configs;
}
}
14 changes: 14 additions & 0 deletions live-editing/configs/CircularProgressbarConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import { IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule }
import { CircularIndeterminateProgressbarComponent } from "../../src/app/data-display/circular-progressbar/circular-indeterminate-progressbar/circular-indeterminate-progressbar.component";
import { CircularProgressbarComponent
} from "../../src/app/data-display/circular-progressbar/circular-progressbar.component";
import {
CircularStylingSampleComponent
} from "../../src/app/data-display/circular-progressbar/circular-styling-sample/circular-styling-sample.component";
import { AppModuleConfig } from "./core/AppModuleConfig";
import { Config } from "./core/Config";
import { IConfigGenerator } from "./core/IConfigGenerator";
Expand Down Expand Up @@ -34,6 +37,17 @@ export class CircularProgressbarConfigGenerator implements IConfigGenerator {
shortenComponentPathBy: "/data-display/circular-progressbar/"
}));

configs.push(new Config({
component: CircularStylingSampleComponent,
appModuleConfig: new AppModuleConfig({
imports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule,
IgxRippleModule, CircularStylingSampleComponent],
ngDeclarations: [CircularStylingSampleComponent],
ngImports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule]
}),
shortenComponentPathBy: "/data-display/circular-progressbar/"
}));

return configs;
}
}
15 changes: 14 additions & 1 deletion live-editing/configs/ComboConfigGenerator.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { HttpClientModule } from "@angular/common/http";
import { IgxComboModule, IgxSelectModule, IgxSwitchModule, IgxToastModule } from "igniteui-angular";
import { IgxButtonModule, IgxCardModule, IgxComboModule, IgxSelectModule,
IgxSwitchModule, IgxToastModule } from "igniteui-angular";
import { RemoteService } from "../../src/app/grid/services/remote.service";
import { ComboBindingComponent } from "../../src/app/lists/combo/combo-binding/combo-binding.component";
import { ComboFeatures } from "../../src/app/lists/combo/combo-features/combo-features.component";
import { ComboMainComponent } from "../../src/app/lists/combo/combo-main/combo-main.component";
import { ComboOverlayComponent } from "../../src/app/lists/combo/combo-overlay/combo-overlay.component";
Expand Down Expand Up @@ -91,6 +93,17 @@ export class ComboConfigGenerator implements IConfigGenerator {
component: ComboOverlayComponent
}));

configs.push(new Config({
additionalFiles: ["/src/app/lists/combo/combo-binding/cities.ts"],
appModuleConfig: new AppModuleConfig({
imports: [IgxComboModule, IgxButtonModule, IgxCardModule, ComboBindingComponent],
ngDeclarations: [ComboBindingComponent],
ngImports: [IgxComboModule, IgxButtonModule, IgxCardModule]
}),
component: ComboBindingComponent,
shortenComponentPathBy: "/lists/combo/"
}));

return configs;
}
}
60 changes: 59 additions & 1 deletion live-editing/configs/DragAndDropConfigGenerator.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
/* tslint:disable:object-literal-sort-keys */
import { IgxDialogModule, IgxDragDirective, IgxDragDropModule, IgxDropDirective } from "igniteui-angular";
import { KanbanSampleComponent } from "../../src/app/interactions/drag-drop/kanban-sample/kanban-sample.component";
import {
IgxDialogModule,
IgxDragDirective,
IgxDragDropModule,
IgxDropDirective,
IgxIconModule,
IgxCheckboxModule,
NoOpScrollStrategy,
ConnectedPositioningStrategy,
GlobalPositionStrategy } from "igniteui-angular";
import { DragDialogSampleComponent } from "../../src/app/interactions/drag-drop/dialog-sample/drag-dialog-sample.component";
import { ListReorderSampleComponent } from "../../src/app/interactions/drag-drop/list-reorder-sample/list-reorder-sample.component";
import { IconsSampleComponent } from "../../src/app/interactions/drag-drop/icons-sample/icons-sample.component";
import { EmailSampleComponent } from "../../src/app/interactions/drag-drop/email-sample/email-sample.component";
import { AppModuleConfig } from "./core/AppModuleConfig";
import { Config } from "./core/Config";
import { IConfigGenerator } from "./core/IConfigGenerator";
Expand All @@ -20,6 +33,51 @@ export class DragAndDropConfigGenerator implements IConfigGenerator {
shortenComponentPathBy: "/interactions/"
}));

configs.push(new Config({
component: EmailSampleComponent,
appModuleConfig: new AppModuleConfig({
imports: [IgxDragDirective, IgxDropDirective,
IgxDragDropModule, IgxIconModule, IgxCheckboxModule, EmailSampleComponent],
ngDeclarations: [EmailSampleComponent],
ngImports: [IgxDragDropModule, IgxIconModule, IgxCheckboxModule]
}),
shortenComponentPathBy: "/interactions/"
}));

configs.push(new Config({
component: ListReorderSampleComponent,
appModuleConfig: new AppModuleConfig({
imports: [IgxDragDirective, IgxDropDirective,
IgxDragDropModule, ListReorderSampleComponent],
ngDeclarations: [ListReorderSampleComponent],
ngImports: [IgxDragDropModule]
}),
shortenComponentPathBy: "/interactions/"
}));

configs.push(new Config({
component: DragDialogSampleComponent,
appModuleConfig: new AppModuleConfig({
imports: [IgxDragDirective, IgxDropDirective,
IgxDragDropModule, IgxDialogModule,
NoOpScrollStrategy, ConnectedPositioningStrategy,
GlobalPositionStrategy,],
ngDeclarations: [DragDialogSampleComponent],
ngImports: [IgxDragDropModule, IgxDialogModule]
}),
shortenComponentPathBy: "/interactions/"
}));

configs.push(new Config({
component: KanbanSampleComponent,
appModuleConfig: new AppModuleConfig({
imports: [IgxDragDirective, IgxDropDirective,
IgxDragDropModule, IgxDialogModule, KanbanSampleComponent],
ngDeclarations: [KanbanSampleComponent],
ngImports: [IgxDragDropModule]
}),
shortenComponentPathBy: "/interactions/"
}));
return configs;
}
}
Loading

0 comments on commit 685139d

Please sign in to comment.