Refactor common code

hugovk · hugovk · commit d0208da06c92 · 2024-02-07T11:53:29.000+02:00
diff --git a/by-year.html b/by-year.html
@@ -29,10 +29,9 @@
     <script src="by-year.js" defer></script>
     <script src="https://unpkg.com/d3@7.6.1/dist/d3.min.js"></script>
     <script>
-      google.charts.load("current", { packages: ["bar"] });
-      google.charts.setOnLoadCallback(async function () {
+      window.onload = function () {
         getDataAndDrawBarChart();
-      });
+      };
     </script>
   </head>
   <body>
diff --git a/by-year.js b/by-year.js
@@ -47,11 +47,11 @@ function drawBarChart(rows) {
 }
 
 async function getDataAndDrawBarChart() {
-  const url =
-    "https://raw.githubusercontent.com/python/devguide/main/core-developers/developers.csv";
-
-  const csvData = await fetchCsvData(url);
-  const processedData = processData(csvData);
-  const dataArray = convertDataToArray(processedData);
-  drawBarChart(dataArray);
+  google.charts.load("current", { packages: ["bar"] });
+  google.charts.setOnLoadCallback(async function () {
+    const csvData = await fetchCsvData();
+    const processedData = processData(csvData);
+    const dataArray = convertDataToArray(processedData);
+    drawBarChart(dataArray);
+  });
 }
diff --git a/current.html b/current.html
@@ -28,10 +28,9 @@
     <script src="script.js" defer></script>
     <script src="https://unpkg.com/d3@7.6.1/dist/d3.min.js"></script>
     <script>
-      google.charts.load("current", { packages: ["timeline"] });
-      google.charts.setOnLoadCallback(function () {
+      window.onload = function () {
         getDataAndDrawChart(true, false);
-      });
+      };
     </script>
   </head>
   <body>
diff --git a/former.html b/former.html
@@ -28,10 +28,9 @@
     <script src="script.js" defer></script>
     <script src="https://unpkg.com/d3@7.6.1/dist/d3.min.js"></script>
     <script>
-      google.charts.load("current", { packages: ["timeline"] });
-      google.charts.setOnLoadCallback(function () {
+      window.onload = function () {
         getDataAndDrawChart(false, true);
-      });
+      };
     </script>
   </head>
   <body>
diff --git a/index.html b/index.html
@@ -28,10 +28,9 @@
     <script src="script.js" defer></script>
     <script src="https://unpkg.com/d3@7.6.1/dist/d3.min.js"></script>
     <script>
-      google.charts.load("current", { packages: ["timeline"] });
-      google.charts.setOnLoadCallback(function () {
+      window.onload = function () {
         getDataAndDrawChart();
-      });
+      };
     </script>
   </head>
   <body>
diff --git a/script.js b/script.js
@@ -1,4 +1,6 @@
-async function fetchCsvData(url) {
+async function fetchCsvData() {
+  const url =
+    "https://raw.githubusercontent.com/python/devguide/main/core-developers/developers.csv";
   const response = await fetch(url);
   const csvText = await response.text();
   return d3.csvParseRows(csvText, d3.autoType);
@@ -65,11 +67,11 @@ function drawChart(rows) {
 }
 
 async function getDataAndDrawChart(showCurrent = true, showFormer = true) {
-  const url =
-    "https://raw.githubusercontent.com/python/devguide/main/core-developers/developers.csv";
-
-  const csvData = await fetchCsvData(url);
-  const filteredData = filterData(csvData, showCurrent, showFormer);
-  const cleanedData = cleanData(filteredData);
-  drawChart(cleanedData);
+  google.charts.load("current", { packages: ["timeline"] });
+  google.charts.setOnLoadCallback(async function () {
+    const csvData = await fetchCsvData();
+    const filteredData = filterData(csvData, showCurrent, showFormer);
+    const cleanedData = cleanData(filteredData);
+    drawChart(cleanedData);
+  });
 }
