]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Refactor data generation in scatter basic example (#5877)
authorgeneric-github-user <40661852+generic-github-user@users.noreply.github.com>
Tue, 4 Dec 2018 08:07:35 +0000 (03:07 -0500)
committerSimon Brunel <simonbrunel@users.noreply.github.com>
Tue, 4 Dec 2018 08:07:35 +0000 (09:07 +0100)
Replace repeated function call with compact function, generateData

samples/charts/scatter/basic.html

index 6ac227c3b954c25b1e7f9a2a762b2e73ed49ebbf..ccf1059f8b808ac98f99d15866c8432d5d526499 100644 (file)
        <button id="randomizeData">Randomize Data</button>
        <script>
                var color = Chart.helpers.color;
+               function generateData() {
+                       var data = [];
+                       for (var i = 0; i < 7; i++) {
+                               data.push({
+                                       x: randomScalingFactor(),
+                                       y: randomScalingFactor()
+                               });
+                       }
+                       return data;
+               }
+               
                var scatterChartData = {
                        datasets: [{
                                label: 'My First dataset',
                                borderColor: window.chartColors.red,
                                backgroundColor: color(window.chartColors.red).alpha(0.2).rgbString(),
-                               data: [{
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }, {
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }, {
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }, {
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }, {
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }, {
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }, {
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }]
+                               data: generateData()
                        }, {
                                label: 'My Second dataset',
                                borderColor: window.chartColors.blue,
                                backgroundColor: color(window.chartColors.blue).alpha(0.2).rgbString(),
-                               data: [{
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }, {
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }, {
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }, {
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }, {
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }, {
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }, {
-                                       x: randomScalingFactor(),
-                                       y: randomScalingFactor(),
-                               }]
+                               data: generateData()
                        }]
                };