|
@@ -941,9 +941,9 @@
|
|
|
}
|
|
|
|
|
|
// This will get the first returned node in the jQuery collection.
|
|
|
- var areaChart = new Chart(areaChartCanvas, {
|
|
|
+ var areaChart = new Chart(areaChartCanvas, {
|
|
|
type: 'line',
|
|
|
- data: areaChartData,
|
|
|
+ data: areaChartData,
|
|
|
options: areaChartOptions
|
|
|
})
|
|
|
|
|
@@ -957,9 +957,9 @@
|
|
|
lineChartData.datasets[1].fill = false;
|
|
|
lineChartOptions.datasetFill = false
|
|
|
|
|
|
- var lineChart = new Chart(lineChartCanvas, {
|
|
|
+ var lineChart = new Chart(lineChartCanvas, {
|
|
|
type: 'line',
|
|
|
- data: lineChartData,
|
|
|
+ data: lineChartData,
|
|
|
options: lineChartOptions
|
|
|
})
|
|
|
|
|
@@ -970,12 +970,12 @@
|
|
|
var donutChartCanvas = $('#donutChart').get(0).getContext('2d')
|
|
|
var donutData = {
|
|
|
labels: [
|
|
|
- 'Chrome',
|
|
|
+ 'Chrome',
|
|
|
'IE',
|
|
|
- 'FireFox',
|
|
|
- 'Safari',
|
|
|
- 'Opera',
|
|
|
- 'Navigator',
|
|
|
+ 'FireFox',
|
|
|
+ 'Safari',
|
|
|
+ 'Opera',
|
|
|
+ 'Navigator',
|
|
|
],
|
|
|
datasets: [
|
|
|
{
|
|
@@ -993,7 +993,7 @@
|
|
|
var donutChart = new Chart(donutChartCanvas, {
|
|
|
type: 'doughnut',
|
|
|
data: donutData,
|
|
|
- options: donutOptions
|
|
|
+ options: donutOptions
|
|
|
})
|
|
|
|
|
|
//-------------
|
|
@@ -1011,7 +1011,7 @@
|
|
|
var pieChart = new Chart(pieChartCanvas, {
|
|
|
type: 'pie',
|
|
|
data: pieData,
|
|
|
- options: pieOptions
|
|
|
+ options: pieOptions
|
|
|
})
|
|
|
|
|
|
//-------------
|
|
@@ -1031,7 +1031,7 @@
|
|
|
}
|
|
|
|
|
|
var barChart = new Chart(barChartCanvas, {
|
|
|
- type: 'bar',
|
|
|
+ type: 'bar',
|
|
|
data: barChartData,
|
|
|
options: barChartOptions
|
|
|
})
|
|
@@ -1056,7 +1056,7 @@
|
|
|
}
|
|
|
|
|
|
var stackedBarChart = new Chart(stackedBarChartCanvas, {
|
|
|
- type: 'bar',
|
|
|
+ type: 'bar',
|
|
|
data: stackedBarChartData,
|
|
|
options: stackedBarChartOptions
|
|
|
})
|