Update chart.js to v2.9.3 and moment.js to v2.24

Also, switch to the plain chart.js build since their bundle included moment.js, thus include moment before chart. Signed-off-by: XhmikosR <[email protected]>
pi-hole · Dec 29, 2019 · 3b6d915 · 3b6d915
1 parent 03b3a1d
commit 3b6d915
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 570 deletions.
diff --git a/db_graph.php b/db_graph.php
@@ -62,7 +62,6 @@
     </div>
 </div>
 
-<script src="scripts/vendor/moment.min.js"></script>
 <script src="scripts/vendor/daterangepicker.js"></script>
 <script src="scripts/pi-hole/js/db_graph.js"></script>
 

diff --git a/db_lists.php b/db_lists.php
@@ -138,7 +138,6 @@
     <!-- /.col -->
 </div>
 
-<script src="scripts/vendor/moment.min.js"></script>
 <script src="scripts/vendor/daterangepicker.js"></script>
 <script src="scripts/pi-hole/js/db_lists.js"></script>
 

diff --git a/db_queries.php b/db_queries.php
@@ -176,7 +176,6 @@
 </div>
 <!-- /.row -->
 
-<script src="scripts/vendor/moment.min.js"></script>
 <script src="scripts/vendor/daterangepicker.js"></script>
 <script src="scripts/pi-hole/js/db_queries.js"></script>
 

diff --git a/network.php b/network.php
@@ -72,6 +72,5 @@
     require "scripts/pi-hole/php/footer.php";
 ?>
 
-<script src="scripts/vendor/moment.min.js"></script>
 <script src="scripts/pi-hole/js/ip-address-sorting.js"></script>
 <script src="scripts/pi-hole/js/network.js"></script>
diff --git a/queries.php b/queries.php
@@ -165,7 +165,6 @@
 </div>
 <!-- /.row -->
 
-<script src="scripts/vendor/moment.min.js"></script>
 <script src="scripts/pi-hole/js/queries.js"></script>
 
 <?php

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
@@ -222,16 +222,16 @@ function pidofFTL()
     <script src="scripts/vendor/bootstrap-notify.min.js"></script>
 
 <?php if(in_array($scriptname, array("groups.php", "groups-clients.php", "groups-domains.php", "groups-adlists.php"))){ ?>
-    <script src="style/vendor/bootstrap/js/bootstrap-multiselect.js"></script>
     <link rel="stylesheet" href="style/vendor/bootstrap/css/bootstrap-multiselect.css">
-    <script src="style/vendor/bootstrap/js/bootstrap-toggle.min.js"></script>
     <link rel="stylesheet" href="style/vendor/bootstrap/css/bootstrap-toggle.min.css">
-    <script src="scripts/vendor/moment.min.js"></script>
+    <script src="style/vendor/bootstrap/js/bootstrap-multiselect.js"></script>
+    <script src="style/vendor/bootstrap/js/bootstrap-toggle.min.js"></script>
 <?php } ?>
 
     <script src="scripts/vendor/jquery.dataTables.min.js"></script>
     <script src="scripts/vendor/dataTables.bootstrap.min.js"></script>
-    <script src="scripts/vendor/Chart.bundle.min.js"></script>
+    <script src="scripts/vendor/moment.min.js"></script>
+    <script src="scripts/vendor/Chart.min.js"></script>
 </head>
 <body class="skin-blue sidebar-mini <?php if($boxedlayout){ ?>layout-boxed<?php } ?>">
  <noscript>

diff --git a/scripts/vendor/Chart.bundle.min.js b/scripts/vendor/Chart.bundle.min.js
diff --git a/scripts/vendor/Chart.min.js b/scripts/vendor/Chart.min.js
diff --git a/scripts/vendor/moment.min.js b/scripts/vendor/moment.min.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,6 @@ @@
         </div>
     </div>
-    <script src="scripts/vendor/moment.min.js"></script>
     <script src="scripts/vendor/daterangepicker.js"></script>
     <script src="scripts/pi-hole/js/db_graph.js"></script>
@@ Expand Down @@