Merge pull request #64 from moorereason/update-chartjs

Update chartjs to 4.4.2
tierpod · Jun 17, 2024 · 86a9937 · 86a9937
2 parents f32bac1 + 783f4b0
commit 86a9937
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 28 deletions.
diff --git a/assets/js/Chart.min.js b/assets/js/Chart.min.js
diff --git a/assets/js/chart.umd.min.js b/assets/js/chart.umd.min.js
diff --git a/assets/js/dmarc-report-converter.js b/assets/js/dmarc-report-converter.js
@@ -45,17 +45,20 @@ $(document).ready(function(){
             }]
         },
         options: {
-            title: {
-                display: true,
-                text: 'messages count per hostnames',
+            aspectRatio: 2,
+            plugins: {
+                legend: {
+                    display: false,
+                },
+                title: {
+                    display: true,
+                    text: 'messages count per hostnames',
+                },
             },
             scales: {
-                yAxes: [{
+                y: {
                     display: false,
-                }]
-            },
-            legend: {
-                display: false,
+                }
             },
         }
     });
@@ -76,18 +79,20 @@ $(document).ready(function(){
             }],
         },
         options: {
-            title: {
-                display: true,
-                text: 'pass/fail messages',
+            aspectRatio: 2,
+            plugins: {
+                legend: {
+                    display: false,
+                },
+                title: {
+                    display: true,
+                    text: 'pass/fail messages',
+                },
             },
             scales: {
-                yAxes: [{
+                y: {
                     display: false,
-                }]
-            },
-            legend: {
-                display: false,
-                // position: 'right'
+                }
             },
         },
     });

diff --git a/cmd/dmarc-report-converter/consts.go b/cmd/dmarc-report-converter/consts.go
@@ -163,7 +163,7 @@ table.table.bottomless
 <body>
     <script src="{{.AssetsPath}}/js/jquery-3.7.1.min.js"></script>
     <script src="{{.AssetsPath}}/js/bootstrap.min.js"></script>
-    <script src="{{.AssetsPath}}/js/Chart.min.js"></script>
+    <script src="{{.AssetsPath}}/js/chart.umd.min.js"></script>
     <script src="{{.AssetsPath}}/js/dmarc-report-converter.js"></script>
 ` + htmlMain + `
 </body>