WebUI: use native functions for event handling

PR #21147.
qbittorrent · Aug 7, 2024 · 2d9e3b3 · 2d9e3b3
1 parent 989b1d1
commit 2d9e3b3
Show file tree

Hide file tree

Showing 30 changed files with 261 additions and 196 deletions.
diff --git a/src/webui/www/private/addpeers.html b/src/webui/www/private/addpeers.html
@@ -24,15 +24,16 @@
             }
         }).activate();
 
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             const hash = new URI().getData("hash");
             if (!hash)
-                return false;
+                return;
 
             $("peers").focus();
 
-            $("addPeersOk").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("addPeersOk").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
 
                 const peers = $("peers").value.trim().split(/[\r\n]+/);
                 if (peers.length === 0)

diff --git a/src/webui/www/private/addtrackers.html b/src/webui/www/private/addtrackers.html
@@ -10,7 +10,7 @@
     <script>
         "use strict";
 
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             new Keyboard({
                 defaultEventType: "keydown",
                 events: {
@@ -26,8 +26,10 @@
             }).activate();
 
             $("trackersUrls").focus();
-            $("addTrackersButton").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("addTrackersButton").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+
                 const hash = new URI().getData("hash");
                 new Request({
                     url: "api/v2/torrents/addTrackers",

diff --git a/src/webui/www/private/confirmdeletion.html b/src/webui/www/private/confirmdeletion.html
@@ -21,7 +21,7 @@
                 icon.style.fill = "var(--color-border-default)";
         }
 
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             new Request({
                 url: "images/object-locked.svg",
                 method: "get",
@@ -41,12 +41,12 @@
             let prefDeleteContentFiles = prefCache.delete_torrent_content_files;
 
             $("deleteFromDiskCB").checked ||= prefDeleteContentFiles;
-            $("deleteFromDiskCB").addEvent("click", (e) => {
+            $("deleteFromDiskCB").addEventListener("click", (e) => {
                 setRememberBtnEnabled($("deleteFromDiskCB").checked !== prefDeleteContentFiles);
             });
 
             // Set current "Delete files" choice as the default
-            $("rememberBtn").addEvent("click", (e) => {
+            $("rememberBtn").addEventListener("click", (e) => {
                 window.parent.qBittorrent.Cache.preferences.set({
                     data: {
                         "delete_torrent_content_files": $("deleteFromDiskCB").checked
@@ -60,13 +60,16 @@
 
             const hashes = new URI().getData("hashes").split("|");
             $("cancelBtn").focus();
-            $("cancelBtn").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("cancelBtn").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
                 window.parent.qBittorrent.Client.closeWindows();
             });
-            $("confirmBtn").addEvent("click", (e) => {
+            $("confirmBtn").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+
                 parent.torrentsTable.deselectAll();
-                new Event(e).stop();
                 const cmd = "api/v2/torrents/delete";
                 const deleteFiles = $("deleteFromDiskCB").checked;
                 new Request({

diff --git a/src/webui/www/private/confirmfeeddeletion.html b/src/webui/www/private/confirmfeeddeletion.html
@@ -10,15 +10,18 @@
     <script>
         "use strict";
 
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             const paths = new URI().getData("paths").split("|");
             $("cancelBtn").focus();
-            $("cancelBtn").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("cancelBtn").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
                 window.parent.qBittorrent.Client.closeWindows();
             });
-            $("confirmBtn").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("confirmBtn").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+
                 let completionCount = 0;
                 paths.forEach((path) => {
                     new Request({

diff --git a/src/webui/www/private/confirmruleclear.html b/src/webui/www/private/confirmruleclear.html
@@ -10,16 +10,19 @@
     <script>
         "use strict";
 
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             const rules = new URI().getData("rules").split("|");
 
             $("cancelBtn").focus();
-            $("cancelBtn").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("cancelBtn").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
                 window.parent.MochaUI.closeWindow(window.parent.$("clearRulesPage"));
             });
-            $("confirmBtn").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("confirmBtn").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+
                 let completionCount = 0;
                 rules.forEach((rule) => {
                     window.parent.qBittorrent.RssDownloader.modifyRuleState(decodeURIComponent(rule), "previouslyMatchedEpisodes", [], () => {

diff --git a/src/webui/www/private/confirmruledeletion.html b/src/webui/www/private/confirmruledeletion.html
@@ -10,16 +10,19 @@
     <script>
         "use strict";
 
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             const rules = new URI().getData("rules").split("|");
 
             $("cancelBtn").focus();
-            $("cancelBtn").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("cancelBtn").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
                 window.parent.MochaUI.closeWindow(window.parent.$("removeRulePage"));
             });
-            $("confirmBtn").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("confirmBtn").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+
                 let completionCount = 0;
                 rules.forEach((rule) => {
                     new Request({

diff --git a/src/webui/www/private/edittracker.html b/src/webui/www/private/edittracker.html
@@ -10,7 +10,7 @@
     <script>
         "use strict";
 
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             new Keyboard({
                 defaultEventType: "keydown",
                 events: {
@@ -31,13 +31,15 @@
 
             const currentUrl = new URI().getData("url");
             if (!currentUrl)
-                return false;
+                return;
 
             $("trackerUrl").value = currentUrl;
             $("trackerUrl").focus();
 
-            $("editTrackerButton").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("editTrackerButton").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+
                 const hash = new URI().getData("hash");
                 new Request({
                     url: "api/v2/torrents/editTracker",

diff --git a/src/webui/www/private/newcategory.html b/src/webui/www/private/newcategory.html
@@ -30,15 +30,15 @@
             }
         }).activate();
 
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             const uriAction = window.qBittorrent.Misc.safeTrim(new URI().getData("action"));
             const uriHashes = window.qBittorrent.Misc.safeTrim(new URI().getData("hashes"));
             const uriCategoryName = window.qBittorrent.Misc.safeTrim(new URI().getData("categoryName"));
             const uriSavePath = window.qBittorrent.Misc.safeTrim(new URI().getData("savePath"));
 
             if (uriAction === "edit") {
                 if (!uriCategoryName)
-                    return false;
+                    return;
 
                 $("categoryName").disabled = true;
                 $("categoryName").value = window.qBittorrent.Misc.escapeHtml(uriCategoryName);
@@ -53,8 +53,9 @@
                 $("categoryName").focus();
             }
 
-            $("categoryNameButton").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("categoryNameButton").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
 
                 const savePath = $("savePath").value.trim();
                 const categoryName = $("categoryName").value.trim();

diff --git a/src/webui/www/private/newfeed.html b/src/webui/www/private/newfeed.html
@@ -28,11 +28,13 @@
                 }
             }
         }).activate();
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             $("feedURL").focus();
             const path = new URI().getData("path");
-            $("submitButton").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("submitButton").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+
                 // check field
                 const feedURL = $("feedURL").value.trim();
                 if (feedURL === "") {

diff --git a/src/webui/www/private/newfolder.html b/src/webui/www/private/newfolder.html
@@ -29,11 +29,13 @@
                 }
             }
         }).activate();
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             $("folderName").focus();
             const path = new URI().getData("path");
-            $("submitButton").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("submitButton").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+
                 // check field
                 const folderName = $("folderName").value.trim();
                 if (folderName === "") {

diff --git a/src/webui/www/private/newrule.html b/src/webui/www/private/newrule.html
@@ -28,10 +28,12 @@
                 }
             }
         }).activate();
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             $("name").focus();
-            $("submitButton").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("submitButton").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+
                 // check field
                 const name = $("name").value.trim();
                 if (name === "") {

diff --git a/src/webui/www/private/newtag.html b/src/webui/www/private/newtag.html
@@ -29,7 +29,7 @@
             }
         }).activate();
 
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             const uriAction = window.qBittorrent.Misc.safeTrim(new URI().getData("action"));
             const uriHashes = window.qBittorrent.Misc.safeTrim(new URI().getData("hashes"));
 
@@ -38,8 +38,9 @@
 
             $("tagName").focus();
 
-            $("tagNameButton").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("tagNameButton").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
 
                 const tagName = $("tagName").value.trim();
 

diff --git a/src/webui/www/private/rename.html b/src/webui/www/private/rename.html
@@ -29,19 +29,21 @@
             }
         }).activate();
 
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             const name = new URI().getData("name");
             // set text field to current value
             if (name)
                 $("rename").value = name;
 
             $("rename").focus();
-            $("renameButton").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("renameButton").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+
                 // check field
                 const name = $("rename").value.trim();
                 if ((name === null) || (name === ""))
-                    return false;
+                    return;
 
                 const hash = new URI().getData("hash");
                 if (hash) {

diff --git a/src/webui/www/private/rename_feed.html b/src/webui/www/private/rename_feed.html
@@ -28,15 +28,17 @@
                 }
             }
         }).activate();
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             const oldPath = new URI().getData("oldPath");
 
             $("rename").value = oldPath;
             $("rename").focus();
             $("rename").setSelectionRange(0, oldPath.length);
 
-            $("renameButton").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("renameButton").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+
                 // check field
                 const newPath = $("rename").value.trim();
                 if (newPath === "") {

diff --git a/src/webui/www/private/rename_file.html b/src/webui/www/private/rename_file.html
@@ -30,7 +30,7 @@
             }
         }).activate();
 
-        window.addEvent("domready", () => {
+        window.addEventListener("DOMContentLoaded", () => {
             const hash = new URI().getData("hash");
             const oldPath = new URI().getData("path");
             const isFolder = ((new URI().getData("isFolder")) === "true");
@@ -41,8 +41,10 @@
             if (!isFolder)
                 $("rename").setSelectionRange(0, oldName.lastIndexOf("."));
 
-            $("renameButton").addEvent("click", (e) => {
-                new Event(e).stop();
+            $("renameButton").addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+
                 // check field
                 const newName = $("rename").value.trim();
                 if (newName === "") {