Skip to content

Commit c760ca7

Browse files
committed
fix(app): fix bugs related to updating to 8th angular version
1 parent 60255eb commit c760ca7

File tree

19 files changed

+36
-36
lines changed

19 files changed

+36
-36
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@angular/router": "8.0.0",
2525
"@ngx-loading-bar/core": "4.1.1",
2626
"@ngx-loading-bar/router": "4.1.1",
27-
"@swimlane/ngx-datatable": "^14.0.0",
27+
"@swimlane/ngx-datatable": "15.0.2",
2828
"@tinymce/tinymce-angular": "2.2.0",
2929
"angular2-text-mask": "8.0.5",
3030
"animate.css": "3.5.2",

src/app/layout/layout.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ export class LayoutComponent implements OnInit {
3333
$sidebar: any;
3434
el: ElementRef;
3535
router: Router;
36-
@ViewChild('spinnerElement') spinnerElement: ElementRef;
37-
@ViewChild('routerComponent') routerComponent: ElementRef;
36+
@ViewChild('spinnerElement', {static: true}) spinnerElement: ElementRef;
37+
@ViewChild('routerComponent', {static: true}) routerComponent: ElementRef;
3838

3939
constructor(config: AppConfig,
4040
el: ElementRef,

src/app/pages/analytics/analytics.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ export class AnalyticsComponent implements OnInit {
9797
]
9898
];
9999

100-
@ViewChild('chartContainer') chartContainer: ElementRef;
101-
@ViewChild('chartLegend') chartLegend: ElementRef;
100+
@ViewChild('chartContainer', {static: true}) chartContainer: ElementRef;
101+
@ViewChild('chartLegend', {static: true}) chartLegend: ElementRef;
102102

103103
trends: Array<any> = [
104104
{

src/app/pages/charts/flot/components/bars-chart/bars-chart.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ declare let jQuery: any;
77
templateUrl: './bars-chart.html'
88
})
99
export class BarsChartComponent implements AfterViewInit {
10-
@ViewChild('chartContainer') chartContainer: ElementRef;
10+
@ViewChild('chartContainer', {static: true}) chartContainer: ElementRef;
1111

1212
getBarChartData() { /* eslint-disable */
1313
return [

src/app/pages/charts/flot/components/bars-stacked-chart/bars-stacked-chart.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ declare let jQuery: any;
77
templateUrl: './bars-stacked-chart.html'
88
})
99
export class BarsStackedChartComponent implements AfterViewInit {
10-
@ViewChild('chartContainer') chartContainer: ElementRef;
10+
@ViewChild('chartContainer', {static: true}) chartContainer: ElementRef;
1111

1212
getStackedBarChartData() {
1313
const seriesCount = 3;

src/app/pages/charts/flot/components/donut-chart/donut-chart.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ declare let jQuery: any;
77
templateUrl: './donut-chart.html'
88
})
99
export class DonutChartComponent implements AfterViewInit {
10-
@ViewChild('chartContainer') chartContainer: ElementRef;
11-
@ViewChild('chartLegend') chartLegend: ElementRef;
10+
@ViewChild('chartContainer', {static: true}) chartContainer: ElementRef;
11+
@ViewChild('chartLegend', {static: true}) chartLegend: ElementRef;
1212

1313
getPieChartData() {
1414
const data = [];

src/app/pages/charts/flot/components/line-chart/line-chart.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ declare let jQuery: any;
77
templateUrl: './line-chart.html'
88
})
99
export class LineChartComponent implements AfterViewInit {
10-
@ViewChild('chartContainer') chartContainer: ElementRef;
10+
@ViewChild('chartContainer', {static: true}) chartContainer: ElementRef;
1111

1212
options: any = {
1313
xaxis: {

src/app/pages/charts/flot/components/markers-chart/markers-chart.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ declare let jQuery: any;
77
templateUrl: './markers-chart.html'
88
})
99
export class MarkersChartComponent implements AfterViewInit {
10-
@ViewChild('chartContainer') chartContainer: ElementRef;
10+
@ViewChild('chartContainer', {static: true}) chartContainer: ElementRef;
1111

1212
data: Array<any> = [
1313
{ data: this.generate(2, 0.6), points: { symbol: 'circle' } },

src/app/pages/charts/flot/components/pie-chart/pie-chart.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ declare let jQuery: any;
77
templateUrl: './pie-chart.html'
88
})
99
export class PieChartComponent implements AfterViewInit {
10-
@ViewChild('chartContainer') chartContainer: ElementRef;
10+
@ViewChild('chartContainer', {static: true}) chartContainer: ElementRef;
1111

1212
getPieChartData() {
1313
const data = [];

src/app/pages/charts/flot/components/tracking-chart/tracking-chart.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ declare let jQuery: any;
77
templateUrl: './tracking-chart.html'
88
})
99
export class TrackingChartComponent implements AfterViewInit {
10-
@ViewChild('chartContainer') chartContainer: ElementRef;
10+
@ViewChild('chartContainer', {static: true}) chartContainer: ElementRef;
1111

1212
chart: any;
1313
legend: any;

src/app/pages/charts/flot/flot.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import 'jquery-sparkline';
1818
templateUrl: './flot.html'
1919
})
2020
export class FlotComponent implements AfterViewInit {
21-
@ViewChild('sparklines1') sparklines1: ElementRef;
22-
@ViewChild('sparklines2') sparklines2: ElementRef;
21+
@ViewChild('sparklines1', {static: true}) sparklines1: ElementRef;
22+
@ViewChild('sparklines2', {static: true}) sparklines2: ElementRef;
2323

2424
initSparkline(ref) {
2525
const spark = jQuery(this[ref].nativeElement);

src/app/pages/charts/morris/morris.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ declare let jQuery: any;
1111
templateUrl: './morris.html'
1212
})
1313
export class MorrisComponent implements AfterViewInit {
14-
@ViewChild('morrisLineChart') morrisLineChart: ElementRef;
15-
@ViewChild('morrisAreaChart') morrisAreaChart: ElementRef;
16-
@ViewChild('morrisBarChart') morrisBarChart: ElementRef;
17-
@ViewChild('morrisDonutChart') morrisDonutChart: ElementRef;
18-
@ViewChild('morrisBar2Chart') morrisBar2Chart: ElementRef;
19-
@ViewChild('morrisStackedChart') morrisStackedChart: ElementRef;
14+
@ViewChild('morrisLineChart', {static: true}) morrisLineChart: ElementRef;
15+
@ViewChild('morrisAreaChart', {static: true}) morrisAreaChart: ElementRef;
16+
@ViewChild('morrisBarChart', {static: true}) morrisBarChart: ElementRef;
17+
@ViewChild('morrisDonutChart', {static: true}) morrisDonutChart: ElementRef;
18+
@ViewChild('morrisBar2Chart', {static: true}) morrisBar2Chart: ElementRef;
19+
@ViewChild('morrisStackedChart', {static: true}) morrisStackedChart: ElementRef;
2020

2121
initMorrisLineChart() {
2222
jQuery(this.morrisLineChart.nativeElement).html('');

src/app/pages/charts/overview/overview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ declare let nv: any;
1212
encapsulation: ViewEncapsulation.None
1313
})
1414
export class OverviewComponent implements OnInit {
15-
@ViewChild('sparklineLineChart') sparklineLineChart: ElementRef;
15+
@ViewChild('sparklineLineChart', {static: true}) sparklineLineChart: ElementRef;
1616

1717
seriesData: Array<any> = [ [], [] ];
1818
random: any;

src/app/pages/charts/sparkline/sparkline.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ declare let jQuery: any;
88
templateUrl: './sparkline.html'
99
})
1010
export class SparklineComponent implements AfterViewInit, OnDestroy {
11-
@ViewChild('sparkline1') sparkline1: ElementRef;
12-
@ViewChild('sparkline2') sparkline2: ElementRef;
13-
@ViewChild('sparkline3') sparkline3: ElementRef;
14-
@ViewChild('sparkline4') sparkline4: ElementRef;
15-
@ViewChild('sparkline5') sparkline5: ElementRef;
16-
@ViewChild('sparkline6') sparkline6: ElementRef;
17-
@ViewChild('sparkline7') sparkline7: ElementRef;
11+
@ViewChild('sparkline1', {static: true}) sparkline1: ElementRef;
12+
@ViewChild('sparkline2', {static: true}) sparkline2: ElementRef;
13+
@ViewChild('sparkline3', {static: true}) sparkline3: ElementRef;
14+
@ViewChild('sparkline4', {static: true}) sparkline4: ElementRef;
15+
@ViewChild('sparkline5', {static: true}) sparkline5: ElementRef;
16+
@ViewChild('sparkline6', {static: true}) sparkline6: ElementRef;
17+
@ViewChild('sparkline7', {static: true}) sparkline7: ElementRef;
1818

1919
generateRandomArr(length, min = null, max = null, isFloat = false) { // eslint-disable-line
2020
const result = [];

src/app/pages/extra/calendar/calendar.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class CalendarComponent implements OnInit, AfterViewInit {
1717
createEvent: any;
1818
calendarEvent: string = null;
1919

20-
@ViewChild('modalWindow') public modalWindow: ModalDirective;
20+
@ViewChild('modalWindow', {static: true}) public modalWindow: ModalDirective;
2121

2222
constructor() {
2323
const date = new Date();

src/app/pages/forms/wizard/bootstrap-application-wizard/bootstrap-application-wizard.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ declare let jQuery: any;
99
export class BootstrapApplicationWizardComponent implements OnInit, AfterViewInit {
1010
$el: any;
1111

12-
@ViewChild('wizard') wizard: ElementRef;
12+
@ViewChild('wizard', {static: true}) wizard: ElementRef;
1313

1414
constructor() {
1515
}

src/app/pages/tables/dynamic/tables-dynamic.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ export class TablesDynamicComponent implements OnInit {
279279
people: any[] = PEOPLE;
280280
peopleTemp: any[] = [...PEOPLE];
281281

282-
@ViewChild(DatatableComponent) table: DatatableComponent;
282+
@ViewChild(DatatableComponent, {static: true}) table: DatatableComponent;
283283

284284
rows: Array<any> = [];
285285
columns: Array<any> = [

src/app/pages/visits/calendar/calendar.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export class CalendarComponent implements AfterViewInit {
1414
@Input() events: Array<any>;
1515
@Input() white: boolean = false;
1616

17-
@ViewChild('calendarWrapper') el: ElementRef;
17+
@ViewChild('calendarWrapper', {static: true}) el: ElementRef;
1818

1919
render(): void {
2020
const monthNames = [

0 commit comments

Comments
 (0)