Merge remote-tracking branch 'remotes/origin/master' into vslavov/row…

…-edit-style

# Conflicts:
#	src/app/hierarchical-grid/hierarchical-grid-routes-data.ts

live-editing/configs/FinancialChartConfigGenerator.ts

@@ -13,7 +13,7 @@ import { FinancialChartHighVolumeComponent} from "../../src/app/charts/financial
 import { FinancialChartIndicatorTypesComponent} from "../../src/app/charts/financial-chart/indicator-types/financial-chart-indicator-types.component";
 import { FinancialChartMultipleDataComponent} from "../../src/app/charts/financial-chart/multiple-data/financial-chart-multiple-data.component";
 import { FinancialChartMultipleFeedsComponent } from "../../src/app/charts/financial-chart/multiple-feeds/financial-chart-multiple-feeds.component";
-import { FinancialChartOverviewComponent} from "../../src/app/charts/financial-chart/overview/financial-chart-overview-sample.component";
+import { FinancialChartOverviewComponent} from "../../src/app/charts/financial-chart/overview/financial-chart-overview.component";
 import { FinancialChartPanesComponent } from "../../src/app/charts/financial-chart/panes/financial-chart-panes.component";
 import { FinancialChartPerformanceComponent } from "../../src/app/charts/financial-chart/performance/financial-chart-performance.component";
 import { FinancialDataService } from "../../src/app/charts/financial-chart/services/financial-data.service";

live-editing/configs/GeoMapConfigGenerator.ts

@@ -148,7 +148,7 @@ export class GeoMapConfigGenerator extends BaseConfigGenerator {
         configs.push(this.getConfig(
                 MapDisplayImageryHeatTilesComponent,
                 [IgxGeographicMapModule], null,
-                ["/src/app/maps/heatworker.worker.ts",
+                ["/src/app/maps/heatmap.worker.ts",
                  "/src/assets/Shapes/AmericanCities.shp",
                  "src/assets/Shapes/AmericanCities.dbf"]));
 

live-editing/configs/GridConfigGenerator.ts

@@ -28,27 +28,27 @@ import {
     IgxToastModule,
     IgxTooltipModule
 } from "igniteui-angular";
+// tslint:disable:max-line-length
+import { CustomGridPagingStyleSample } from "../../src/app/grid/custom-grid-paging-style/custom-grid-paging-style.component";
 import {
     GridBatchEditingSampleComponent
 } from "../../src/app/grid/grid-batch-editing/grid-batch-editing-sample.component";
 import { GridWithTransactionsComponent } from "../../src/app/grid/grid-batch-editing/grid-transaction.component";
 import { GridComponent } from "../../src/app/grid/grid-boston-marathon/grid.component";
+import { GridClipboardSampleComponent } from "../../src/app/grid/grid-clipboard-operations-sample/grid-clipboard-operations-sample.component";
 import {
     GridColumnHidingSampleComponent
 } from "../../src/app/grid/grid-column-hiding-sample/grid-column-hiding-sample.component";
 import {
     GridColumnHidingToolbarSampleComponent
 } from "../../src/app/grid/grid-column-hiding-toolbar-sample/grid-column-hiding-toolbar-sample.component";
-// tslint:disable-next-line:max-line-length
 import { GridCompositeDataComponent } from "../../src/app/grid/grid-composite-data-binding/grid-composite-data.component";
 import {
     GridConditionalCellStyleComponent
 } from "../../src/app/grid/grid-conditional-cell-style/grid-conditional-cell-style.component";
 import { ContextmenuComponent } from "../../src/app/grid/grid-contextmenu-sample/contextmenu/contextmenu.component";
-// tslint:disable-next-line: max-line-length
 import { GridContextmenuSampleComponent } from "../../src/app/grid/grid-contextmenu-sample/grid-contextmenu-sample.component";
 import { GridCustomFilteringComponent } from "../../src/app/grid/grid-custom-filtering/grid-custom-filtering.component";
-// tslint:disable-next-line: max-line-length
 import { GridCustomKBNavigationComponent } from "../../src/app/grid/grid-custom-kb-navigation/grid-custom-kb-navigation-sample.component";
 import {
     GridDisplayDensitySampleComponent
@@ -75,20 +75,12 @@ import { GridMovingSampleComponent } from "../../src/app/grid/grid-moving-sample
 import {
     GridMovingStyledSampleComponent
 } from "../../src/app/grid/grid-moving-styled-sample/grid-moving-styled-sample.component";
-
-// tslint:disable-next-line: max-line-length
+import { GridMRLCustomNavigationComponent } from "../../src/app/grid/grid-mrl-custom-navigation/grid-mrl-custom-navigation.component";
 import { GridMultiCellSelectionStyleComponent } from "../../src/app/grid/grid-multi-cell-selection-style/grid-multi-cell-selection-style.component";
-// tslint:disable-next-line:max-line-length
 import { GridMultiCellSelectionComponent } from "../../src/app/grid/grid-multi-cell-selection/grid-multi-cell-selection.component";
 import {
     GridMultiRowLayoutConfigurationComponent
 } from "../../src/app/grid/grid-multi-row-layout-configuration/grid-multi-row-layout-configuration.component";
-
-// tslint:disable-next-line: max-line-length
-import { GridMRLCustomNavigationComponent } from "../../src/app/grid/grid-mrl-custom-navigation/grid-mrl-custom-navigation.component";
-
-// tslint:disable-next-line: max-line-length
-import { CustomGridPagingStyleSample } from "../../src/app/grid/custom-grid-paging-style/custom-grid-paging-style.component";
 import { GridMultiRowLayoutComponent } from "../../src/app/grid/grid-multi-row-layout/grid-multi-row-layout.component";
 import { GridNestedDataBindComponent } from "../../src/app/grid/grid-nested-data-binding/grid-nested-data-bind";
 import { PagingSampleComponent } from "../../src/app/grid/grid-paging-sample/grid-paging-sample.component";
@@ -127,7 +119,10 @@ import { GridToolbarSample1Component } from "../../src/app/grid/grid-toolbar-sam
 import { GridToolbarSample2Component } from "../../src/app/grid/grid-toolbar-sample/grid-toolbar-sample-2.component";
 import { GridToolbarSample3Component } from "../../src/app/grid/grid-toolbar-sample/grid-toolbar-sample-3.component";
 import { GridToolbarSample4Component } from "../../src/app/grid/grid-toolbar-sample/grid-toolbar-sample-4.component";
-import { GridToolbarStyleComponent } from "../../src/app/grid/grid-toolbar-style/grid-toolbar-style.component"
+import { GridToolbarStyleComponent } from "../../src/app/grid/grid-toolbar-style/grid-toolbar-style.component";
+import {
+    GridMultiColumnHeaderTemplateComponent
+} from "../../src/app/grid/multi-column-header-template/multi-column-header-template";
 import { GridMultiColumnHeadersComponent } from "../../src/app/grid/multi-column-headers/multi-column-headers";
 import { DataService } from "../../src/app/grid/services/data.service";
 import { RemoteFilteringService } from "../../src/app/grid/services/remoteFilteringService";
@@ -136,6 +131,7 @@ import { RemoteServiceVirt } from "../../src/app/grid/services/remoteService";
 import { AppModuleConfig } from "./core/AppModuleConfig";
 import { Config } from "./core/Config";
 import { IConfigGenerator } from "./core/IConfigGenerator";
+// tslint:enable:max-line-length
 
 export class GridConfigGenerator implements IConfigGenerator {
     public generateConfigs(): Config[] {
@@ -755,6 +751,26 @@ export class GridConfigGenerator implements IConfigGenerator {
             })
         }));
 
+        configs.push(new Config({
+            component: GridMultiColumnHeaderTemplateComponent,
+            additionalFiles: ["/src/app/grid/multi-column-header-template/data.ts"],
+            appModuleConfig: new AppModuleConfig({
+                imports: [GridMultiColumnHeaderTemplateComponent, IgxGridModule],
+                ngDeclarations: [GridMultiColumnHeaderTemplateComponent],
+                ngImports: [IgxGridModule]
+            })
+        }));
+
+        configs.push(new Config({
+            component: GridClipboardSampleComponent,
+            additionalFiles: ["/src/app/data/nwindData.ts"],
+            appModuleConfig: new AppModuleConfig({
+                imports: [GridClipboardSampleComponent, IgxGridModule, IgxSwitchModule],
+                ngDeclarations: [GridClipboardSampleComponent],
+                ngImports: [IgxGridModule, IgxSwitchModule]
+            })
+        }));
+
         return configs;
     }
 }

live-editing/configs/HierarchicalGridConfigGenerator.ts

@@ -1,4 +1,5 @@
 // tslint:disable:max-line-length
+import { HttpClientModule } from "@angular/common/http";
 import {
     IgxButtonGroupModule,
     IgxButtonModule,
@@ -39,6 +40,7 @@ import { HGridCustomFilteringSampleComponent } from "../../src/app/hierarchical-
 import { HGridFilteringSampleComponent } from "../../src/app/hierarchical-grid/hierarchical-grid-filtering/hierarchical-grid-filtering.component";
 import { HierarchicalGridLoDSampleComponent } from "../../src/app/hierarchical-grid/hierarchical-grid-lod/hierarchical-grid-lod.component";
 import { HGridMultiCellStyleComponent } from "../../src/app/hierarchical-grid/hierarchical-grid-multi-cell-style/hierarchical-grid-multi-cell-style.component";
+import { HGridMultiHeaderTemplateSampleComponent } from "../../src/app/hierarchical-grid/hierarchical-grid-multi-column-header-template/hierarchical-grid-multi-column-template.component";
 import { HGridMultiHeadersSampleComponent } from "../../src/app/hierarchical-grid/hierarchical-grid-multi-column-headers/hierarchical-grid-multi-column.component";
 import { HGridPagingStyleSampleComponent } from "../../src/app/hierarchical-grid/hierarchical-grid-paging-style/hierarchical-grid-paging-style.component";
 import { HGridPagingSampleComponent } from "../../src/app/hierarchical-grid/hierarchical-grid-paging/hierarchical-grid-paging.component";
@@ -222,9 +224,9 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
         configs.push(new Config({
             additionalFiles: ["/src/app/hierarchical-grid/hierarchical-grid-paging/remotePagingService.ts"],
             appModuleConfig: new AppModuleConfig({
-                imports: [IgxHierarchicalGridModule, HGridRemotePagingSampleComponent],
+                imports: [IgxHierarchicalGridModule, HGridRemotePagingSampleComponent, HttpClientModule],
                 ngDeclarations: [HGridRemotePagingSampleComponent],
-                ngImports: [IgxHierarchicalGridModule]
+                ngImports: [IgxHierarchicalGridModule, HttpClientModule]
             }),
             component: HGridRemotePagingSampleComponent
         }));
@@ -433,6 +435,16 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
             shortenComponentPathBy: "/hierarchical-grid/"
         }));
 
+        configs.push(new Config({
+            additionalFiles: ["/src/app/hierarchical-grid/data.ts"],
+            appModuleConfig: new AppModuleConfig({
+                imports: [IgxHierarchicalGridModule, HGridMultiHeaderTemplateSampleComponent],
+                ngDeclarations: [HGridMultiHeaderTemplateSampleComponent],
+                ngImports: [IgxHierarchicalGridModule]
+            }),
+            component: HGridMultiHeaderTemplateSampleComponent
+        }));
+
         return configs;
     }
 }

live-editing/configs/PieChartConfigGenerator.ts

@@ -3,12 +3,12 @@
 // tslint:disable:max-line-length
 // tslint:disable:member-ordering
 // tslint:disable:prefer-const
-import { IgxPieChartComponent } from "igniteui-angular-charts/ES5/igx-pie-chart-component";
+
 import { IgxPieChartModule } from "igniteui-angular-charts/ES5/igx-pie-chart-module";
 import { IgxItemLegendModule } from "igniteui-angular-charts/ES5/igx-item-legend-module";
 import { IgxLegendModule } from "igniteui-angular-charts/ES5/igx-legend-module";
 
-import { PieChartDataSampleComponent } from "../../src/app/charts/pie-chart/pie-chart-data-sample/pie-chart-data-sample.component";
+import { PieChartDataSampleComponent } from "../../src/app/charts/pie-chart/pie-chart-overview/pie-chart-overview.component";
 import { PieChartExplosionComponent } from "../../src/app/charts/pie-chart/pie-chart-explosion/pie-chart-explosion.component";
 import { PieChartLegendComponent } from "../../src/app/charts/pie-chart/pie-chart-legend/pie-chart-legend.component";
 import { PieChartOthersComponent } from "../../src/app/charts/pie-chart/pie-chart-others/pie-chart-others.component";
@@ -24,8 +24,6 @@ export class PieChartConfigGenerator extends BaseConfigGenerator {
         super(DependenciesType.Charts, "/charts/pie-chart/");
     }
 
-// export class PieChartConfigGenerator implements IConfigGenerator {
-
     public generateConfigs(): Config[] {
         const configs = new Array<Config>();
 

live-editing/configs/TabBarConfigGenerator.ts

@@ -1,9 +1,14 @@
 /* tslint:disable:object-literal-sort-keys */
 import { Router, RouterModule, Routes } from "@angular/router";
-import { IgxAvatarModule, IgxBottomNavModule, IgxButtonModule,
-    IgxIconModule, IgxListModule, IgxRippleModule } from "igniteui-angular";
+import { IgxAvatarModule, IgxBottomNavModule, IgxButtonModule, IgxGridModule,
+    IgxIconModule, IgxListModule, IgxRippleModule, IgxSelectModule } from "igniteui-angular";
 import { TabbarSample1Component } from "../../src/app/layouts/tabbar/tabbar-sample-1/tabbar-sample-1.component";
 import { TabbarSample2Component } from "../../src/app/layouts/tabbar/tabbar-sample-2/tabbar-sample-2.component";
+import {
+    BottomNavRoutingView1Component,
+    BottomNavRoutingView2Component,
+    BottomNavRoutingView3Component,
+    TabbarSample3Component } from "../../src/app/layouts/tabbar/tabbar-sample-3/tabbar-sample-3.component";
 import { TabbarComponent } from "../../src/app/layouts/tabbar/tabbar.component";
 import { AppModuleConfig } from "./core/AppModuleConfig";
 import { Config } from "./core/Config";
@@ -54,6 +59,33 @@ export class TabBarConfigGenerator implements IConfigGenerator {
             shortenComponentPathBy: "/layouts/tabbar/"
         }));
 
+        // tabbar sample 3
+        configs.push(new Config({
+            component: TabbarSample3Component,
+            appModuleConfig: new AppModuleConfig({
+                imports: [
+                    Router, RouterModule, TabbarSample3Component, IgxBottomNavModule, IgxGridModule,
+                    IgxSelectModule, BottomNavRoutingView1Component, BottomNavRoutingView2Component,
+                    BottomNavRoutingView3Component
+                ],
+                ngDeclarations: [
+                    TabbarSample3Component, BottomNavRoutingView1Component, BottomNavRoutingView2Component,
+                    BottomNavRoutingView3Component
+                ],
+                ngImports: [
+                    IgxBottomNavModule, IgxGridModule, IgxSelectModule,
+                    `
+                    RouterModule.forRoot([
+                        { path: 'arrivals', component: BottomNavRoutingView1Component },
+                        { path: 'departures', component: BottomNavRoutingView2Component },
+                        { path: 'canceled', component: BottomNavRoutingView3Component }
+                    ])
+                    `
+                ]
+            }),
+            shortenComponentPathBy: "/layouts/tabbar/"
+        }));
+
         return configs;
     }
 }

live-editing/configs/TabsConfigGenerator.ts

@@ -1,7 +1,10 @@
 /* tslint:disable:object-literal-sort-keys */
+
+import { Router, RouterModule } from "@angular/router";
+
 import {
-    IgxAvatarModule, IgxButtonModule, IgxCardModule, IgxIconModule,
-    IgxNavbarModule, IgxRippleModule, IgxTabsModule
+    IgxAvatarModule, IgxButtonModule, IgxCardModule, IgxGridModule, IgxIconModule, IgxNavbarModule, IgxRippleModule,
+    IgxSelectModule, IgxTabsModule, IgxToggleModule
 } from "igniteui-angular";
 
 import { TabsSample1Component } from "../../src/app/layouts/tabs/tabs-sample-1/tabs-sample-1.component";
@@ -15,6 +18,11 @@ import { AppRouting2Module } from "../../src/app/layouts/tabs/tabs-sample-5/app.
 import { TabsSample5Component } from "../../src/app/layouts/tabs/tabs-sample-5/components/tabs-sample-5.component";
 import { TabsSample5Module } from "../../src/app/layouts/tabs/tabs-sample-5/tabs-sample-5.module";
 import { TabsRouting2Module } from "../../src/app/layouts/tabs/tabs-sample-5/tabs.routing2.module";
+import {
+    TabsRoutingView1Component,
+    TabsRoutingView2Component,
+    TabsRoutingView3Component,
+    TabsSample6Component } from "../../src/app/layouts/tabs/tabs-sample-6/tabs-sample-6.component";
 import { AppModuleConfig } from "./core/AppModuleConfig";
 import { Config } from "./core/Config";
 import { IConfigGenerator } from "./core/IConfigGenerator";
@@ -102,6 +110,31 @@ export class TabsConfigGenerator implements IConfigGenerator {
             shortenComponentPathBy: "/layouts/tabs/"
         }));
 
+        configs.push(new Config({
+            component: TabsSample6Component,
+            appModuleConfig: new AppModuleConfig({
+                imports: [
+                    Router, RouterModule, TabsSample6Component, IgxGridModule, IgxSelectModule, IgxTabsModule,
+                    TabsRoutingView1Component, TabsRoutingView2Component, TabsRoutingView3Component
+                ],
+                ngDeclarations: [
+                    TabsSample6Component, TabsRoutingView1Component, TabsRoutingView2Component,
+                    TabsRoutingView3Component
+                ],
+                ngImports: [
+                    IgxGridModule, IgxSelectModule, IgxTabsModule,
+                    `
+                    RouterModule.forRoot([
+                        { path: 'arrivals', component: TabsRoutingView1Component },
+                        { path: 'departures', component: TabsRoutingView2Component },
+                        { path: 'canceled', component: TabsRoutingView3Component }
+                    ])
+                    `
+                ]
+            }),
+            shortenComponentPathBy: "/layouts/tabs/"
+        }));
+
         return configs;
     }
 }

live-editing/configs/ThemingConfigGenerator.ts

@@ -2,7 +2,8 @@
 // tslint:disable:object-literal-sort-keys
 import { IgxButtonGroupModule, IgxButtonModule, IgxCalendarModule, IgxCardModule,
     IgxDatePickerModule, IgxDialogModule, IgxDropDownModule, IgxGridModule, IgxIconModule,
-    IgxInputGroupModule, IgxLayoutModule, IgxRippleModule, IgxSnackbarModule, IgxToggleModule } from "igniteui-angular";
+    IgxInputGroupModule, IgxLayoutModule, IgxRippleModule, IgxSelectModule, IgxSnackbarModule,
+    IgxToggleModule } from "igniteui-angular";
 import { DarkThemeSampleComponent } from "../../src/app/theming/dark-theme-sample/dark-theme-sample.component";
 import { DefaultThemeSampleComponent } from "../../src/app/theming/default-theme-sample/default-theme-sample.component";
 import { DisplayDensityComponent } from "../../src/app/theming/display-density/display-density.component";
@@ -29,13 +30,13 @@ export class ThemingConfigGenerator implements IConfigGenerator {
                 imports: [IgxDropDownModule,
                     IgxGridModule, IgxDialogModule, IgxSnackbarModule, IgxLayoutModule, ThemeChooserSampleComponent,
                     IgxCalendarModule, IgxToggleModule, IgxIconModule, IgxRippleModule, IgxButtonModule,
-                    IgxInputGroupModule, IgxDatePickerModule],
+                    IgxInputGroupModule, IgxDatePickerModule, IgxSelectModule],
                 ngDeclarations: [ThemeChooserSampleComponent],
                 ngImports: [IgxDropDownModule,
                     IgxDialogModule, IgxSnackbarModule, IgxLayoutModule,
                     IgxToggleModule, IgxIconModule, IgxRippleModule, IgxButtonModule,
                     IgxCalendarModule, IgxInputGroupModule, IgxDatePickerModule,
-                    IgxGridModule, IgxLayoutModule]
+                    IgxGridModule, IgxLayoutModule, IgxSelectModule]
             }),
             shortenComponentPathBy: "/theming/"
         }));