Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mdd-Investigate-Issue-Do NOT MERGE #295

Open
wants to merge 1 commit into
base: vnext
Choose a base branch
from
Open

mdd-Investigate-Issue-Do NOT MERGE #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion browser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"ng": "ng",
"update": "ng update",
"build": "gulp updateBrowser && gulp overwrite-package-json && ng build --configuration production --progress=true",
"start": "gulp updateBrowser && ng serve --configuration es5 -o",
"start": "ng serve --configuration es5 -o",
"startProd": "gulp updateBrowser && ng serve --configuration production --configuration es5 -o --progress=true",
"start:es5": "ng serve -o",
"startHost": "ng serve --configuration es5 -o",
Expand Down
31 changes: 22 additions & 9 deletions browser/src/app/index/index.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,24 @@ import BrowserInfo from "../../browser-info.json";

// note these section is auto-generated - do not change it:
// Auto-Insert-Imports-RoutingData-Start
import { RoutingDataForCharts } from "../../samples/charts/routing-data";
import { RoutingDataForExcel } from "../../samples/excel/routing-data";
import { RoutingDataForGauges } from "../../samples/gauges/routing-data";
import { RoutingDataForInputs } from "../../samples/inputs/routing-data";
import { RoutingDataForMaps } from "../../samples/maps/routing-data";
// import { RoutingDataForCharts } from "../../samples/charts/routing-data";
// import { RoutingDataForExcel } from "../../samples/excel/routing-data";
// import { RoutingDataForGauges } from "../../samples/gauges/routing-data";
// import { RoutingDataForInputs } from "../../samples/inputs/routing-data";
// import { RoutingDataForMaps } from "../../samples/maps/routing-data";

export const RoutingDataForCharts = {

"data-chart/stacked-column-chart": { displayName: "Stacked Column Chart", parentName: "DataChart", showLink: true },
"data-chart-stacked-column-chart": { displayName: "Stacked Column Chart", parentName: "DataChart", showLink: false },
"data-chart/stacked-line-chart": { displayName: "Stacked Line Chart", parentName: "DataChart", showLink: true },
"data-chart-stacked-line-chart": { displayName: "Stacked Line Chart", parentName: "DataChart", showLink: false },
// "data-chart/stacked-spline-chart": { displayName: "Stacked Spline Chart", parentName: "DataChart", showLink: true },
// "data-chart-stacked-spline-chart": { displayName: "Stacked Spline Chart", parentName: "DataChart", showLink: false },
// "data-chart/stacked-spline-area-chart": { displayName: "Stacked Spline Area Chart", parentName: "DataChart", showLink: true },
// "data-chart-stacked-spline-area-chart": { displayName: "Stacked Spline Area Chart", parentName: "DataChart", showLink: false },

};


// Auto-Insert-Imports-RoutingData-End
Expand Down Expand Up @@ -50,10 +63,10 @@ export class IndexComponent implements OnInit, AfterViewInit {
private modulesRoutes = [
// Auto-Insert-SamplesRoutingArray-Start
{ path: "charts", routesData: RoutingDataForCharts },
{ path: "excel", routesData: RoutingDataForExcel },
{ path: "gauges", routesData: RoutingDataForGauges },
{ path: "inputs", routesData: RoutingDataForInputs },
{ path: "maps", routesData: RoutingDataForMaps }
// { path: "excel", routesData: RoutingDataForExcel },
// { path: "gauges", routesData: RoutingDataForGauges },
// { path: "inputs", routesData: RoutingDataForInputs },
// { path: "maps", routesData: RoutingDataForMaps }


// Auto-Insert-SamplesRoutingArray-End
Expand Down
8 changes: 2 additions & 6 deletions samples/charts/data-chart/stacked-column-chart/src/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,13 @@
Annual Birth Rates by World Region
</div>
<div class="legend">
<igx-legend
name="legend"
#legend
orientation="Horizontal">
</igx-legend>

</div>
<div class="container fill">
<igx-data-chart
name="chart"
#chart
[legend]="legend"

isHorizontalZoomEnabled="false"
isVerticalZoomEnabled="false">
<igx-category-x-axis
Expand Down
3 changes: 1 addition & 2 deletions samples/charts/data-chart/stacked-column-chart/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import { IgxLegendComponent, IgxDataChartComponent, IgxCategoryXAxisComponent, I
export class AppComponent implements AfterViewInit
{

@ViewChild("legend", { static: true } )
private legend: IgxLegendComponent

@ViewChild("chart", { static: true } )
private chart: IgxDataChartComponent
@ViewChild("xAxis", { static: true } )
Expand Down
10 changes: 2 additions & 8 deletions samples/charts/data-chart/stacked-line-chart/src/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,12 @@
<div class="legend-title">
Annual Birth Rates by World Region
</div>
<div class="legend">
<igx-legend
name="legend"
#legend
orientation="Horizontal">
</igx-legend>
</div>

<div class="container fill">
<igx-data-chart
name="chart"
#chart
[legend]="legend"

isHorizontalZoomEnabled="false"
isVerticalZoomEnabled="false">
<igx-category-x-axis
Expand Down
3 changes: 1 addition & 2 deletions samples/charts/data-chart/stacked-line-chart/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import { IgxLegendComponent, IgxDataChartComponent, IgxCategoryXAxisComponent, I
export class AppComponent implements AfterViewInit
{

@ViewChild("legend", { static: true } )
private legend: IgxLegendComponent

@ViewChild("chart", { static: true } )
private chart: IgxDataChartComponent
@ViewChild("xAxis", { static: true } )
Expand Down