Fix problem on javascript runtime error on doughnut chart

pull/54/head
christianesperar 2016-03-13 02:25:19 +08:00
parent 6b71e150f3
commit fa2339c979
3 changed files with 176 additions and 38 deletions

View File

@ -1244,23 +1244,43 @@
<!-- dashbord linegraph --> <!-- dashbord linegraph -->
<script> <script>
var doughnutData = [{ Chart.defaults.global.legend = {
value: 30, enabled: false
color: "#455C73" };
}, {
value: 30, var data = {
color: "#9B59B6" labels: [
}, { "Symbian",
value: 60, "Blackberry",
color: "#BDC3C7" "Other",
}, { "Android",
value: 100, "IOS"
color: "#26B99A" ],
}, { datasets: [{
value: 120, data: [15, 20, 30, 10, 30],
color: "#3498DB" backgroundColor: [
}]; "#BDC3C7",
var myDoughnut = new Chart(document.getElementById("canvas1").getContext("2d")).Doughnut(doughnutData); "#9B59B6",
"#455C73",
"#26B99A",
"#3498DB"
],
hoverBackgroundColor: [
"#CFD4D8",
"#B370CF",
"#34495E",
"#36CAAB",
"#49A9EA"
]
}]
};
var canvasDoughnut = new Chart(document.getElementById("canvas1"), {
type: 'doughnut',
tooltipFillColor: "rgba(51, 51, 51, 0.55)",
data: data
});
</script> </script>
<!-- /dashbord linegraph --> <!-- /dashbord linegraph -->
<!-- datepicker --> <!-- datepicker -->

View File

@ -996,9 +996,109 @@
value: 120, value: 120,
color: "#3498DB" color: "#3498DB"
}]; }];
var myDoughnut = new Chart(document.getElementById("canvas1i").getContext("2d")).Doughnut(doughnutData);
var myDoughnut = new Chart(document.getElementById("canvas1i2").getContext("2d")).Doughnut(doughnutData); Chart.defaults.global.legend = {
var myDoughnut = new Chart(document.getElementById("canvas1i3").getContext("2d")).Doughnut(doughnutData); enabled: false
};
var canvasDoughnut = new Chart(document.getElementById("canvas1i"), {
type: 'doughnut',
showTooltips: false,
tooltipFillColor: "rgba(51, 51, 51, 0.55)",
data: {
labels: [
"Symbian",
"Blackberry",
"Other",
"Android",
"IOS"
],
datasets: [{
data: [15, 20, 30, 10, 30],
backgroundColor: [
"#BDC3C7",
"#9B59B6",
"#455C73",
"#26B99A",
"#3498DB"
],
hoverBackgroundColor: [
"#CFD4D8",
"#B370CF",
"#34495E",
"#36CAAB",
"#49A9EA"
]
}]
}
});
var canvasDoughnut = new Chart(document.getElementById("canvas1i2"), {
type: 'doughnut',
showTooltips: false,
tooltipFillColor: "rgba(51, 51, 51, 0.55)",
data: {
labels: [
"Symbian",
"Blackberry",
"Other",
"Android",
"IOS"
],
datasets: [{
data: [15, 20, 30, 10, 30],
backgroundColor: [
"#BDC3C7",
"#9B59B6",
"#455C73",
"#26B99A",
"#3498DB"
],
hoverBackgroundColor: [
"#CFD4D8",
"#B370CF",
"#34495E",
"#36CAAB",
"#49A9EA"
]
}]
}
});
var canvasDoughnut = new Chart(document.getElementById("canvas1i3"), {
type: 'doughnut',
showTooltips: false,
tooltipFillColor: "rgba(51, 51, 51, 0.55)",
data: {
labels: [
"Symbian",
"Blackberry",
"Other",
"Android",
"IOS"
],
datasets: [{
data: [15, 20, 30, 10, 30],
backgroundColor: [
"#BDC3C7",
"#9B59B6",
"#455C73",
"#26B99A",
"#3498DB"
],
hoverBackgroundColor: [
"#CFD4D8",
"#B370CF",
"#34495E",
"#36CAAB",
"#49A9EA"
]
}]
}
});
}); });
</script> </script>
<!-- --> <!-- -->

View File

@ -1044,26 +1044,44 @@
minSpotColor: '#26B99A' minSpotColor: '#26B99A'
}); });
var doughnutData = [{ Chart.defaults.global.legend = {
value: 30, enabled: false
color: "#455C73" };
}, {
value: 30,
color: "#9B59B6"
}, {
value: 60,
color: "#BDC3C7"
}, {
value: 100,
color: "#26B99A"
}, {
value: 120,
color: "#3498DB"
}];
var myDoughnut = new Chart(document.getElementById("canvas1").getContext("2d")).Doughnut(doughnutData);
var data = {
labels: [
"Symbian",
"Blackberry",
"Other",
"Android",
"IOS"
],
datasets: [{
data: [15, 20, 30, 10, 30],
backgroundColor: [
"#BDC3C7",
"#9B59B6",
"#455C73",
"#26B99A",
"#3498DB"
],
hoverBackgroundColor: [
"#CFD4D8",
"#B370CF",
"#34495E",
"#36CAAB",
"#49A9EA"
]
}) }]
};
var canvasDoughnut = new Chart(document.getElementById("canvas1"), {
type: 'doughnut',
tooltipFillColor: "rgba(51, 51, 51, 0.55)",
data: data
});
});
</script> </script>
<!-- --> <!-- -->
<!-- datepicker --> <!-- datepicker -->