fix(meditation-chart): fix access to undefined attribute via init prop

Sirimangalo · Sep 23, 2016 · d8e0b0e · d8e0b0e
1 parent 2f2429f
commit d8e0b0e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -95,7 +95,7 @@
     "hammerjs": "^2.0.8",
     "ie-shim": "^0.1.0",
     "jstimezonedetect": "^1.0.6",
-    "ng2-charts": "^1.2.0",
+    "ng2-charts": "^1.3.0",
     "normalize.css": "^4.1.1",
     "rxjs": "5.0.0-beta.12",
     "scriptjs": "^2.5.8",

diff --git a/src/app/meditation/chart/meditation-chart.component.ts b/src/app/meditation/chart/meditation-chart.component.ts
@@ -23,7 +23,8 @@ export class MeditationChartComponent {
   // chart details
   chartSubscribtion: Subscription;
   chartLastHour: string = '';
-  chartData: Array<any> = [{data: [], label: ''}, {data: [], label: ''}];
+  initChart: boolean = false;
+  chartData: Array<any> = [];
   chartLabels: String[] = [];
   chartColors: Array<any> = [];
   chartOptions = {
@@ -104,6 +105,7 @@ export class MeditationChartComponent {
             }
             this.chartData = [data, dataCurrentHour];
             this.chartColors = colors;
+            this.initChart = true;
           }, () => this.loading = false);
       });
   }

diff --git a/src/app/meditation/chart/meditation-chart.html b/src/app/meditation/chart/meditation-chart.html
@@ -1,4 +1,4 @@
-<div class="chart-wrapper">
+<div class="chart-wrapper" *ngIf="initChart">
   <base-chart
     class="chart"
     [datasets]="chartData"