From d55847013f09f2df322c746fa76b1d87abdf83b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Mon, 10 Oct 2022 15:57:17 +0200
Subject: [PATCH] Fix deprecated warnings of jquery-migrate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 scripts/pi-hole/js/db_graph.js       |  2 +-
 scripts/pi-hole/js/db_queries.js     |  4 +-
 scripts/pi-hole/js/footer.js         |  6 +--
 scripts/pi-hole/js/groups-domains.js |  2 +-
 scripts/pi-hole/js/index.js          |  4 +-
 scripts/pi-hole/js/network.js        |  4 +-
 scripts/pi-hole/js/queries.js        | 56 +++++++++++++++-------------
 scripts/pi-hole/js/queryads.js       |  2 +-
 scripts/pi-hole/js/settings.js       | 12 +++---
 scripts/pi-hole/js/taillog-FTL.js    |  4 +-
 scripts/pi-hole/js/taillog.js        |  4 +-
 11 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/scripts/pi-hole/js/db_graph.js b/scripts/pi-hole/js/db_graph.js
index 4ca0fb6b..c8405a5a 100644
--- a/scripts/pi-hole/js/db_graph.js
+++ b/scripts/pi-hole/js/db_graph.js
@@ -390,7 +390,7 @@ $("#querytime").on("apply.daterangepicker", function (ev, picker) {
   updateQueriesOverTime();
 });
 
-$("#queryOverTimeChart").click(function (evt) {
+$("#queryOverTimeChart").on("click", function (evt) {
   var activePoints = timeLineChart.getElementsAtEventForMode(
     evt,
     "nearest",
diff --git a/scripts/pi-hole/js/db_queries.js b/scripts/pi-hole/js/db_queries.js
index 9afbf402..46f41858 100644
--- a/scripts/pi-hole/js/db_queries.js
+++ b/scripts/pi-hole/js/db_queries.js
@@ -464,12 +464,12 @@ $("#querytime").on("apply.daterangepicker", function (ev, picker) {
   refreshTableData();
 });
 
-$("input[id^=type]").change(function () {
+$("input[id^=type]").on("change", function () {
   if (datepickerManuallySelected) {
     reloadBox.show();
   }
 });
 
-$(".bt-reload").click(function () {
+$(".bt-reload").on("click", function () {
   refreshTableData();
 });
diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js
index d562ceb7..73ab2107 100644
--- a/scripts/pi-hole/js/footer.js
+++ b/scripts/pi-hole/js/footer.js
@@ -150,7 +150,7 @@ function initCheckboxRadioStyle() {
   var iCheckStyle = $("#iCheckStyle");
   if (iCheckStyle !== null) {
     iCheckStyle.val(chkboxStyle);
-    iCheckStyle.change(function () {
+    iCheckStyle.on("change", function () {
       var themename = $(this).val();
       localStorage.setItem("theme_icheck", themename);
       applyCheckboxRadioStyle(themename);
@@ -197,7 +197,7 @@ function initCPUtemp() {
   var tempunitSelector = $("#tempunit-selector");
   if (tempunitSelector !== null) {
     tempunitSelector.val(tempunit);
-    tempunitSelector.change(function () {
+    tempunitSelector.on("change", function () {
       tempunit = $(this).val();
       setCPUtemp(tempunit);
     });
@@ -256,7 +256,7 @@ $("#pihole-disable-custom").on("click", function (e) {
 });
 
 // Handle Ctrl + Enter button on Login page
-$(document).keypress(function (e) {
+$(document).on("keypress", function (e) {
   if ((e.keyCode === 10 || e.keyCode === 13) && e.ctrlKey && $("#loginpw").is(":focus")) {
     $("#loginform").attr("action", "settings.php");
     $("#loginform").submit();
diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js
index 1dd2c026..f1228dd5 100644
--- a/scripts/pi-hole/js/groups-domains.js
+++ b/scripts/pi-hole/js/groups-domains.js
@@ -69,7 +69,7 @@ function showSuggestDomains(value) {
     // Purposefully omit 'btn' class to save space on padding
     return $('<button type="button" class="btn-link btn-block text-right">')
       .append($("<i>").text(hostname))
-      .click(function () {
+      .on("click", function () {
         hideSuggestDomains();
         newDomainEl.val(hostname);
       });
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 9c838cf5..00816972 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -1056,7 +1056,7 @@ $(function () {
     updateTopClientsChart();
   }
 
-  $("#queryOverTimeChart").click(function (evt) {
+  $("#queryOverTimeChart").on("click", function (evt) {
     var activePoints = timeLineChart.getElementsAtEventForMode(
       evt,
       "nearest",
@@ -1078,7 +1078,7 @@ $(function () {
     return false;
   });
 
-  $("#clientsChart").click(function (evt) {
+  $("#clientsChart").on("click", function (evt) {
     var activePoints = clientsChart.getElementsAtEventForMode(
       evt,
       "nearest",
diff --git a/scripts/pi-hole/js/network.js b/scripts/pi-hole/js/network.js
index ea321bc1..20c6c678 100644
--- a/scripts/pi-hole/js/network.js
+++ b/scripts/pi-hole/js/network.js
@@ -178,7 +178,7 @@ $(function () {
         }
 
         $("td:eq(3)", row).html(names.join("<br>"));
-        $("td:eq(3)", row).hover(function () {
+        $("td:eq(3)", row).on("hover", function () {
           this.title = allnames.join("\n");
         });
       }
@@ -201,7 +201,7 @@ $(function () {
       }
 
       $("td:eq(0)", row).html(ips.join("<br>"));
-      $("td:eq(0)", row).hover(function () {
+      $("td:eq(0)", row).on("hover", function () {
         this.title = data.ip.join("\n");
       });
 
diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index d96ac77e..79ff213d 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -240,17 +240,18 @@ $(function () {
       $("td:eq(6)", row).html(buttontext);
 
       if (DomainlistLink) {
-        $("td:eq(4)", row).hover(
-          function () {
+        $("td:eq(4)", row).on(
+          "hover",
+          (function () {
             this.title = "Click to show matching blacklist/whitelist domain";
             this.style.color = "#72afd2";
           },
           function () {
             this.style.color = "";
-          }
+          })
         );
         $("td:eq(4)", row).off(); // Release any possible previous onClick event handlers
-        $("td:eq(4)", row).click(function () {
+        $("td:eq(4)", row).on("click", function () {
           var newTab = window.open("groups-domains.php?domainid=" + data[9], "_blank");
           if (newTab) {
             newTab.focus();
@@ -366,80 +367,85 @@ $(function () {
       // Query type IPv4 / IPv6
       api
         .$("td:eq(1)")
-        .click(function (event) {
+        .on("click", function (event) {
           addColumnFilter(event, 1, this.textContent);
         })
-        .hover(
-          function () {
+        .on(
+          "hover",
+          (function () {
             $(this).addClass("pointer").attr("title", tooltipText(1, this.textContent));
           },
           function () {
             $(this).removeClass("pointer");
-          }
+          })
         );
 
       // Domain
       api
         .$("td:eq(2)")
-        .click(function (event) {
+        .on("click", function (event) {
           addColumnFilter(event, 2, this.textContent.split("\n")[0]);
         })
-        .hover(
-          function () {
+        .on(
+          "hover",
+          (function () {
             $(this).addClass("pointer").attr("title", tooltipText(2, this.textContent));
           },
           function () {
             $(this).removeClass("pointer");
-          }
+          })
         );
 
       // Client
       api
         .$("td:eq(3)")
-        .click(function (event) {
+        .on("click", function (event) {
           addColumnFilter(event, 3, this.textContent);
         })
-        .hover(
-          function () {
+        .on(
+          "hover",
+          (function () {
             $(this).addClass("pointer").attr("title", tooltipText(3, this.textContent));
           },
           function () {
             $(this).removeClass("pointer");
-          }
+          })
         );
 
       // Status
       api
         .$("td:eq(4)")
-        .click(function (event) {
+        .on("click", function (event) {
           var id = this.children.id.value;
           var text = this.textContent;
           addColumnFilter(event, 4, id + "#" + text);
         })
-        .hover(
-          function () {
+        .on(
+          "hover",
+          (function () {
             $(this).addClass("pointer").attr("title", tooltipText(4, this.textContent));
           },
           function () {
             $(this).removeClass("pointer");
-          }
+          })
         );
 
       // Reply type
       api
         .$("td:eq(5)")
-        .click(function (event) {
+        .on("click", function (event) {
           var id = this.children.id.value;
           var text = this.textContent.split(" ")[0];
           addColumnFilter(event, 5, id + "#" + text);
         })
-        .hover(
-          function () {
+        .on(
+          "hover",
+          (function () {
             $(this).addClass("pointer").attr("title", tooltipText(5, this.textContent));
           },
           function () {
             $(this).removeClass("pointer");
-          }
+          })
         );
 
       // Disable autocorrect in the search box
@@ -465,7 +471,7 @@ $(function () {
     }
   });
 
-  $("#resetButton").click(function () {
+  $("#resetButton").on("click", function () {
     tableApi.search("");
     resetColumnsFilters();
   });
diff --git a/scripts/pi-hole/js/queryads.js b/scripts/pi-hole/js/queryads.js
index cb8625ac..08ba3098 100644
--- a/scripts/pi-hole/js/queryads.js
+++ b/scripts/pi-hole/js/queryads.js
@@ -87,7 +87,7 @@ function eventsource() {
 }
 
 // Handle enter key
-$("#domain").keypress(function (e) {
+$("#domain").on("keypress", function (e) {
   if (e.which === 13) {
     // Enter was pressed, and the input has focus
     exact = "";
diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
index e89bf860..1acf786d 100644
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
@@ -59,7 +59,7 @@ $(function () {
   });
 
   // display selected import file on button's adjacent textfield
-  $("#zip_file").change(function () {
+  $("#zip_file").on("change", function () {
     var fileName = $(this)[0].files.length === 1 ? $(this)[0].files[0].name : "";
     $("#zip_filename").val(fileName);
   });
@@ -194,7 +194,7 @@ $("#apiTokenModal").on("show.bs.modal", function () {
   $('iframe[name="apiToken_iframe"]').contents().find("table").css(qrCodeStyle);
 });
 
-$("#DHCPchk").click(function () {
+$("#DHCPchk").on("click", function () {
   $("input.DHCPgroup").prop("disabled", !this.checked);
   $("#dhcpnotice").prop("hidden", !this.checked).addClass("lookatme");
 });
@@ -347,7 +347,7 @@ $(function () {
 
   // En-/disable conditional forwarding input fields based
   // on the checkbox state
-  $('input[name="rev_server"]').click(function () {
+  $('input[name="rev_server"]').on("click", function () {
     $('input[name="rev_server_cidr"]').prop("disabled", !this.checked);
     $('input[name="rev_server_target"]').prop("disabled", !this.checked);
     $('input[name="rev_server_domain"]').prop("disabled", !this.checked);
@@ -377,7 +377,7 @@ $(function () {
     }
   }
 
-  bargraphs.click(function () {
+  bargraphs.on("click", function () {
     localStorage.setItem("barchart_chkbox", bargraphs.prop("checked"));
   });
 });
@@ -397,7 +397,7 @@ $(function () {
     }
   }
 
-  colorfulQueryLog.click(function () {
+  colorfulQueryLog.on("click", function () {
     localStorage.setItem("colorfulQueryLog_chkbox", colorfulQueryLog.prop("checked"));
   });
 });
@@ -463,7 +463,7 @@ $(function () {
     }
   }
 
-  nonfatalwarnigns.click(function () {
+  nonfatalwarnigns.on("click", function () {
     localStorage.setItem("hideNonfatalDnsmasqWarnings_chkbox", nonfatalwarnigns.prop("checked"));
     // Call check messages to make new setting effective
     checkMessages();
diff --git a/scripts/pi-hole/js/taillog-FTL.js b/scripts/pi-hole/js/taillog-FTL.js
index dd1a97b1..2a8093ad 100644
--- a/scripts/pi-hole/js/taillog-FTL.js
+++ b/scripts/pi-hole/js/taillog-FTL.js
@@ -39,11 +39,11 @@ $(function () {
   reloadData();
 });
 
-$("#chk1").click(function () {
+$("#chk1").on("click", function () {
   $("#chk2").prop("checked", this.checked);
   scrolling = this.checked;
 });
-$("#chk2").click(function () {
+$("#chk2").on("click", function () {
   $("#chk1").prop("checked", this.checked);
   scrolling = this.checked;
 });
diff --git a/scripts/pi-hole/js/taillog.js b/scripts/pi-hole/js/taillog.js
index 5262ae65..97f2b1bd 100644
--- a/scripts/pi-hole/js/taillog.js
+++ b/scripts/pi-hole/js/taillog.js
@@ -39,11 +39,11 @@ $(function () {
   reloadData();
 });
 
-$("#chk1").click(function () {
+$("#chk1").on("click", function () {
   $("#chk2").prop("checked", this.checked);
   scrolling = this.checked;
 });
-$("#chk2").click(function () {
+$("#chk2").on("click", function () {
   $("#chk1").prop("checked", this.checked);
   scrolling = this.checked;
 });