Adding Common Chart View Variable

Madhuka · Jun 29, 2015 · a555875 · a555875
1 parent f0d300d
commit a555875
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/app/scripts/controllers/chart-controllers.js b/app/scripts/controllers/chart-controllers.js
@@ -60,12 +60,11 @@ angular.module('apacheZeppelinGsocApp').controller('ChartCtrl', function($scope,
       case 'NVD3Chart':
         //set data for NVD3
         myNewChart = ChartService.getNVD3Chart(myChartType);
-        vm.data = myNewChart.viewModel.data;
-        vm.options = myNewChart.viewModel.options;
+        vm.chart = myNewChart.viewModel;
         break;
       case 'highChart':
         myNewChart = ChartService.getHighChart(myChartType);
-        vm.chartConfig = myNewChart.viewModel;
+        vm.chart = myNewChart.viewModel;
         break;
       case 'googleChart':
         myNewChart = ChartService.getGoogleChart(myChartType);

diff --git a/app/views/charts/highchart.html b/app/views/charts/highchart.html
@@ -1,4 +1,4 @@
 <div class="box">
   <label>High Chart</label>
-  <highchart id="chart1" config="chartctrl.chartConfig"></highchart>
+  <highchart id="chart1" config="chartctrl.chart"></highchart>
 </div>
diff --git a/app/views/charts/nvd3chart.html b/app/views/charts/nvd3chart.html
@@ -1,4 +1,4 @@
 <div class="box">
   <label>NVD3 Chart</label>
-  <nvd3 options='chartctrl.options' data='chartctrl.data'></nvd3>
+  <nvd3 options='chartctrl.chart.options' data='chartctrl.chart.data'></nvd3>
 </div>