]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
improve progress-bar sample
authorVille Hämäläinen <hamalainen.ville.p@gmail.com>
Sun, 28 Feb 2016 07:43:21 +0000 (09:43 +0200)
committerVille Hämäläinen <hamalainen.ville.p@gmail.com>
Sun, 28 Feb 2016 07:43:21 +0000 (09:43 +0200)
- 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

samples/timeScale/line-time-point-data.html

index 576a1f3a94c055540017c28ee3fa2a93df1d8138..1e4f747beaea23b0319424f487664185a759f5da 100644 (file)
@@ -7,26 +7,23 @@
        <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="randomizeData">Randomize Data</button>
        <button id="addData">Add Data</button>
        <button id="removeData">Remove Data</button>
-       <div>
-               <h3>Legend</h3>
-               <div id="legendContainer">
-               </div>
-       </div>
        <script>
                function randomScalingFactor() {
                        return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
                        },
                        options: {
                                responsive: true,
+                title:{
+                    display:true,
+                    text:"Chart.js Line Chart - Time Point Data"
+                },
                                scales: {
                                        xAxes: [{
                                                type: "time",
                        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) {
                                $.each(dataset.data, function(j, dataObj) {
                        });
 
                        window.myLine.update();
-                       updateLegend();
                });
 
                $('#addData').click(function() {
                        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()
                                        .add(1, 'day')
                                        .format('MM/DD/YYYY HH:mm');
                                }
 
                                window.myLine.update();
-                               updateLegend();
                        }
                });
 
                        });
 
                        window.myLine.update();
-                       updateLegend();
                });
        </script>
 </body>