]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
improve line-legend sample
authorVille Hämäläinen <hamalainen.ville.p@gmail.com>
Sun, 28 Feb 2016 05:50:13 +0000 (07:50 +0200)
committerVille Hämäläinen <hamalainen.ville.p@gmail.com>
Sun, 28 Feb 2016 05:50:13 +0000 (07:50 +0200)
- improve title
- set same size canvas as other samples
- fix x-axis labels when adding data
- remove user select from canvas
- remove logs

samples/line-legend.html

index bc5659e89373aee8bb7554e855ac9afaaf2b9310..e454eb08f8fa9ea48fbb168507f6fbf5ede86288 100644 (file)
@@ -7,14 +7,16 @@
     <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);
+            -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>
@@ -24,6 +26,7 @@
     <button id="addData">Add Data</button>
     <button id="removeData">Remove Data</button>
     <script>
+        var MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
         var randomScalingFactor = function() {
             return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
         };
@@ -84,7 +87,7 @@
                 },
                 title: {
                     display: true,
-                    text: 'Our 4 Favorite Datasets'
+                    text: 'Chart.js Line Chart - Legend'
                 }
             }
         };
             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() {
             if (config.data.datasets.length > 0) {
-                config.data.labels.push('dataset #' + config.data.labels.length);
+                var month = MONTHS[config.data.labels.length % MONTHS.length];
+                config.data.labels.push(month);
 
                 $.each(config.data.datasets, function(i, dataset) {
                     dataset.data.push(randomScalingFactor());
                 });
 
                 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>