improve progress-bar sample

- set title
- set same size canvas as other samples
- fix adding data after all data has been removed
- remove user select from canvas
- remove html legend
This commit is contained in:
Ville Hämäläinen 2016-02-28 09:43:21 +02:00
parent f23b640c81
commit 0480f2e18d

View File

@ -7,26 +7,23 @@
<script src="../../dist/Chart.bundle.js"></script> <script src="../../dist/Chart.bundle.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script> <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<style> <style>
canvas { canvas {
-webkit-box-shadow: 0 0 20px 0 rgba(0, 0, 0, .5); -moz-user-select: none;
} -webkit-user-select: none;
-ms-user-select: none;
}
</style> </style>
</head> </head>
<body> <body>
<div style="width:100%;"> <div style="width:75%;">
<canvas id="canvas" style="width:100%;height:100%"></canvas> <canvas id="canvas"></canvas>
</div> </div>
<br> <br>
<br> <br>
<button id="randomizeData">Randomize Data</button> <button id="randomizeData">Randomize Data</button>
<button id="addData">Add Data</button> <button id="addData">Add Data</button>
<button id="removeData">Remove Data</button> <button id="removeData">Remove Data</button>
<div>
<h3>Legend</h3>
<div id="legendContainer">
</div>
</div>
<script> <script>
function randomScalingFactor() { function randomScalingFactor() {
return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1)); return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
@ -87,6 +84,10 @@
}, },
options: { options: {
responsive: true, responsive: true,
title:{
display:true,
text:"Chart.js Line Chart - Time Point Data"
},
scales: { scales: {
xAxes: [{ xAxes: [{
type: "time", type: "time",
@ -119,15 +120,8 @@
var ctx = document.getElementById("canvas").getContext("2d"); var ctx = document.getElementById("canvas").getContext("2d");
window.myLine = new Chart(ctx, config); window.myLine = new Chart(ctx, config);
updateLegend();
}; };
function updateLegend() {
$legendContainer = $('#legendContainer');
$legendContainer.empty();
$legendContainer.append(window.myLine.generateLegend());
}
$('#randomizeData').click(function() { $('#randomizeData').click(function() {
$.each(config.data.datasets, function(i, dataset) { $.each(config.data.datasets, function(i, dataset) {
$.each(dataset.data, function(j, dataObj) { $.each(dataset.data, function(j, dataObj) {
@ -136,12 +130,12 @@
}); });
window.myLine.update(); window.myLine.update();
updateLegend();
}); });
$('#addData').click(function() { $('#addData').click(function() {
if (config.data.datasets.length > 0) { if (config.data.datasets.length > 0) {
var newTime = myLine.scales['x-axis-0'].labelMoments[0][myLine.scales['x-axis-0'].labelMoments[0].length - 1] var lastTime = myLine.scales['x-axis-0'].labelMoments[0].length ? myLine.scales['x-axis-0'].labelMoments[0][myLine.scales['x-axis-0'].labelMoments[0].length - 1] : moment();
var newTime = lastTime
.clone() .clone()
.add(1, 'day') .add(1, 'day')
.format('MM/DD/YYYY HH:mm'); .format('MM/DD/YYYY HH:mm');
@ -154,7 +148,6 @@
} }
window.myLine.update(); window.myLine.update();
updateLegend();
} }
}); });
@ -164,7 +157,6 @@
}); });
window.myLine.update(); window.myLine.update();
updateLegend();
}); });
</script> </script>
</body> </body>