]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
improve combo-time-scale sample
authorVille Hämäläinen <hamalainen.ville.p@gmail.com>
Sun, 28 Feb 2016 07:46:59 +0000 (09:46 +0200)
committerVille Hämäläinen <hamalainen.ville.p@gmail.com>
Sun, 28 Feb 2016 07:46:59 +0000 (09:46 +0200)
- set title
- set same size canvas as other samples
- remove user select from canvas
- remove html legend
- remove logs

samples/timeScale/combo-time-scale.html

index 146b425bb7238782e07356cefcc7fbf53a2e0c59..7f0bc18d4c261770d22163bfd1bfb55f8494024a 100644 (file)
@@ -2,20 +2,22 @@
 <html>
 
 <head>
-       <title>Line Chart</title>
+       <title>Line Chart - Combo Time Scale</title>
        <script src="../../node_modules/moment/min/moment.min.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>
        <style>
-               canvas {
-                       -webkit-box-shadow: 0 0 20px 0 rgba(0, 0, 0, .5);
-               }
+    canvas {
+        -moz-user-select: none;
+        -webkit-user-select: none;
+        -ms-user-select: none;
+    }
        </style>
 </head>
 
 <body>
-       <div style="width:100%;">
-               <canvas id="canvas" style="width:100%;height:100%"></canvas>
+       <div style="width:75%;">
+               <canvas id="canvas"></canvas>
        </div>
        <br>
        <br>
        <button id="removeDataset">Remove Dataset</button>
        <button id="addData">Add Data</button>
        <button id="removeData">Remove Data</button>
-       <div>
-               <h3>Legend</h3>
-               <div id="legendContainer">
-               </div>
-       </div>
        <script>
                var timeFormat = 'MM/DD/YYYY HH:mm';
 
                        options: {
                                showLines: true,
                                responsive: true,
+                title:{
+                    display:true,
+                    text:"Chart.js Line Chart - Combo Time Scale"
+                },
                                scales: {
                                        xAxes: [{
                                                type: "time",
                        dataset.pointBorderWidth = 1;
                });
 
-               console.log(config.data);
-
                window.onload = function() {
                        var ctx = document.getElementById("canvas").getContext("2d");
                        window.myLine = new Chart(ctx, config);
 
-                       updateLegend();
                };
 
-               function updateLegend() {
-                       $legendContainer = $('#legendContainer');
-                       $legendContainer.empty();
-                       $legendContainer.append(window.myLine.generateLegend());
-               }
-
                $('#randomizeData').click(function() {
                        $.each(config.data.datasets, function(i, dataset) {
                                dataset.data = dataset.data.map(function() {
                        });
 
                        window.myLine.update();
-                       updateLegend();
                });
 
                $('#addDataset').click(function() {
 
                        config.data.datasets.push(newDataset);
                        window.myLine.update();
-                       updateLegend();
                });
 
                $('#addData').click(function() {
                                }
 
                                window.myLine.update();
-                               updateLegend();
                        }
                });
 
                $('#removeDataset').click(function() {
                        config.data.datasets.splice(0, 1);
                        window.myLine.update();
-                       updateLegend();
                });
 
                $('#removeData').click(function() {
                        });
 
                        window.myLine.update();
-                       updateLegend();
                });
        </script>
 </body>