Merge pull request #20828 from Chocobo1/js_quotes

WebUI: enforce coding styles
qbittorrent · May 28, 2024 · d529950 · d529950
2 parents 6d07377 + 1ba69be
commit d529950
Show file tree

Hide file tree

Showing 58 changed files with 3,780 additions and 3,736 deletions.
diff --git a/src/webui/www/eslint.config.mjs b/src/webui/www/eslint.config.mjs
@@ -1,8 +1,8 @@
-import Globals from 'globals';
-import Html from 'eslint-plugin-html';
-import Js from '@eslint/js';
-import Stylistic from '@stylistic/eslint-plugin';
-import * as RegexpPlugin from 'eslint-plugin-regexp';
+import Globals from "globals";
+import Html from "eslint-plugin-html";
+import Js from "@eslint/js";
+import Stylistic from "@stylistic/eslint-plugin";
+import * as RegexpPlugin from "eslint-plugin-regexp";
 
 export default [
     Js.configs.recommended,
@@ -27,8 +27,14 @@ export default [
         },
         rules: {
             "eqeqeq": "error",
+            "guard-for-in": "error",
             "no-undef": "off",
             "no-unused-vars": "off",
+            "no-var": "error",
+            "operator-assignment": "error",
+            "prefer-arrow-callback": "error",
+            "prefer-const": "error",
+            "radix": "error",
             "Stylistic/no-mixed-operators": [
                 "error",
                 {
@@ -38,6 +44,14 @@ export default [
                 }
             ],
             "Stylistic/nonblock-statement-body-position": ["error", "below"],
+            "Stylistic/quotes": [
+                "error",
+                "double",
+                {
+                    "avoidEscape": true,
+                    "allowTemplateLiterals": true
+                }
+            ],
             "Stylistic/semi": "error"
         }
     }

diff --git a/src/webui/www/package.json b/src/webui/www/package.json
@@ -7,8 +7,8 @@
   },
   "scripts": {
     "extract_translation": "i18next -c public/i18next-parser.config.mjs public/index.html public/scripts/login.js",
-    "format": "js-beautify -r private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js && prettier --write **.css",
-    "lint": "eslint private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js && stylelint **/*.css && html-validate private public"
+    "format": "js-beautify -r *.mjs private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js && prettier --write **.css",
+    "lint": "eslint *.mjs private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js && stylelint **/*.css && html-validate private public"
   },
   "devDependencies": {
     "@stylistic/eslint-plugin": "*",

diff --git a/src/webui/www/private/addpeers.html b/src/webui/www/private/addpeers.html
@@ -8,42 +8,42 @@
     <script src="scripts/lib/MooTools-Core-1.6.0-compat-compressed.js"></script>
     <script src="scripts/lib/MooTools-More-1.6.0-compat-compressed.js"></script>
     <script>
-        'use strict';
+        "use strict";
 
         new Keyboard({
-            defaultEventType: 'keydown',
+            defaultEventType: "keydown",
             events: {
-                'Escape': function(event) {
+                "Escape": function(event) {
                     window.parent.qBittorrent.Client.closeWindows();
                     event.preventDefault();
                 },
-                'Esc': function(event) {
+                "Esc": function(event) {
                     window.parent.qBittorrent.Client.closeWindows();
                     event.preventDefault();
                 }
             }
         }).activate();
 
-        window.addEvent('domready', function() {
-            const hash = new URI().getData('hash');
+        window.addEvent("domready", () => {
+            const hash = new URI().getData("hash");
             if (!hash)
                 return false;
 
-            $('peers').focus();
+            $("peers").focus();
 
-            $('addPeersOk').addEvent('click', function(e) {
+            $("addPeersOk").addEvent("click", (e) => {
                 new Event(e).stop();
 
-                const peers = $('peers').get('value').trim().split(/[\r\n]+/);
+                const peers = $("peers").get("value").trim().split(/[\r\n]+/);
                 if (peers.length === 0)
                     return;
 
                 new Request({
-                    url: 'api/v2/torrents/addPeers',
-                    method: 'post',
+                    url: "api/v2/torrents/addPeers",
+                    method: "post",
                     data: {
                         hashes: hash,
-                        peers: peers.join('|')
+                        peers: peers.join("|")
                     },
                     onFailure: function() {
                         alert("QBT_TR(Unable to add peers. Please ensure you are adhering to the IP:port format.)QBT_TR[CONTEXT=HttpServer]");

diff --git a/src/webui/www/private/addtrackers.html b/src/webui/www/private/addtrackers.html
@@ -8,33 +8,33 @@
     <script src="scripts/lib/MooTools-Core-1.6.0-compat-compressed.js"></script>
     <script src="scripts/lib/MooTools-More-1.6.0-compat-compressed.js"></script>
     <script>
-        'use strict';
+        "use strict";
 
-        window.addEvent('domready', function() {
+        window.addEvent("domready", () => {
             new Keyboard({
-                defaultEventType: 'keydown',
+                defaultEventType: "keydown",
                 events: {
-                    'Escape': function(event) {
+                    "Escape": function(event) {
                         window.parent.qBittorrent.Client.closeWindows();
                         event.preventDefault();
                     },
-                    'Esc': function(event) {
+                    "Esc": function(event) {
                         window.parent.qBittorrent.Client.closeWindows();
                         event.preventDefault();
                     }
                 }
             }).activate();
 
-            $('trackersUrls').focus();
-            $('addTrackersButton').addEvent('click', function(e) {
+            $("trackersUrls").focus();
+            $("addTrackersButton").addEvent("click", (e) => {
                 new Event(e).stop();
-                const hash = new URI().getData('hash');
+                const hash = new URI().getData("hash");
                 new Request({
-                    url: 'api/v2/torrents/addTrackers',
-                    method: 'post',
+                    url: "api/v2/torrents/addTrackers",
+                    method: "post",
                     data: {
                         hash: hash,
-                        urls: $('trackersUrls').value
+                        urls: $("trackersUrls").value
                     },
                     onComplete: function() {
                         window.parent.qBittorrent.Client.closeWindows();

diff --git a/src/webui/www/private/confirmdeletion.html b/src/webui/www/private/confirmdeletion.html
@@ -8,73 +8,73 @@
     <script src="scripts/lib/MooTools-Core-1.6.0-compat-compressed.js"></script>
     <script src="scripts/lib/MooTools-More-1.6.0-compat-compressed.js"></script>
     <script>
-        'use strict';
+        "use strict";
 
         function setRememberBtnEnabled(enable) {
-            const btn = $('rememberBtn');
+            const btn = $("rememberBtn");
             btn.disabled = !enable;
 
-            const icon = btn.getElementsByTagName('path')[0];
+            const icon = btn.getElementsByTagName("path")[0];
             if (enable)
-                icon.style.removeProperty('fill');
+                icon.style.removeProperty("fill");
             else
                 icon.style.fill = "var(--color-border-default)";
         }
 
-        window.addEvent('domready', function() {
+        window.addEvent("domready", () => {
             new Request({
-                url: 'images/object-locked.svg',
-                method: 'get',
+                url: "images/object-locked.svg",
+                method: "get",
                 onSuccess: function(text, xml) {
                     const newIcon = xml.childNodes[0];
-                    newIcon.style.height = '24px';
-                    newIcon.style.width = '24px';
-                    $('rememberBtn').appendChild(newIcon);
+                    newIcon.style.height = "24px";
+                    newIcon.style.width = "24px";
+                    $("rememberBtn").appendChild(newIcon);
                     setRememberBtnEnabled(false);
                 }
             }).send();
 
-            const isDeletingFiles = (new URI().getData('deleteFiles') === "true");
-            $('deleteFromDiskCB').checked = isDeletingFiles;
+            const isDeletingFiles = (new URI().getData("deleteFiles") === "true");
+            $("deleteFromDiskCB").checked = isDeletingFiles;
 
             const prefCache = window.parent.qBittorrent.Cache.preferences.get();
             let prefDeleteContentFiles = prefCache.delete_torrent_content_files;
 
-            $('deleteFromDiskCB').checked ||= prefDeleteContentFiles;
-            $('deleteFromDiskCB').addEvent('click', function(e) {
-                setRememberBtnEnabled($('deleteFromDiskCB').checked !== prefDeleteContentFiles);
+            $("deleteFromDiskCB").checked ||= prefDeleteContentFiles;
+            $("deleteFromDiskCB").addEvent("click", (e) => {
+                setRememberBtnEnabled($("deleteFromDiskCB").checked !== prefDeleteContentFiles);
             });
 
             // Set current "Delete files" choice as the default
-            $('rememberBtn').addEvent('click', function(e) {
+            $("rememberBtn").addEvent("click", (e) => {
                 window.parent.qBittorrent.Cache.preferences.set({
                     data: {
-                        'delete_torrent_content_files': $('deleteFromDiskCB').checked
+                        "delete_torrent_content_files": $("deleteFromDiskCB").checked
                     },
                     onSuccess: function() {
-                        prefDeleteContentFiles = $('deleteFromDiskCB').checked;
+                        prefDeleteContentFiles = $("deleteFromDiskCB").checked;
                         setRememberBtnEnabled(false);
                     }
                 });
             });
 
-            const hashes = new URI().getData('hashes').split('|');
-            $('cancelBtn').focus();
-            $('cancelBtn').addEvent('click', function(e) {
+            const hashes = new URI().getData("hashes").split("|");
+            $("cancelBtn").focus();
+            $("cancelBtn").addEvent("click", (e) => {
                 new Event(e).stop();
                 window.parent.qBittorrent.Client.closeWindows();
             });
-            $('confirmBtn').addEvent('click', function(e) {
+            $("confirmBtn").addEvent("click", (e) => {
                 parent.torrentsTable.deselectAll();
                 new Event(e).stop();
-                const cmd = 'api/v2/torrents/delete';
-                const deleteFiles = $('deleteFromDiskCB').get('checked');
+                const cmd = "api/v2/torrents/delete";
+                const deleteFiles = $("deleteFromDiskCB").get("checked");
                 new Request({
                     url: cmd,
-                    method: 'post',
+                    method: "post",
                     data: {
-                        'hashes': hashes.join('|'),
-                        'deleteFiles': deleteFiles
+                        "hashes": hashes.join("|"),
+                        "deleteFiles": deleteFiles
                     },
                     onComplete: function() {
                         window.parent.qBittorrent.Client.closeWindows();

diff --git a/src/webui/www/private/confirmfeeddeletion.html b/src/webui/www/private/confirmfeeddeletion.html
@@ -8,22 +8,22 @@
     <script src="scripts/lib/MooTools-Core-1.6.0-compat-compressed.js"></script>
     <script src="scripts/lib/MooTools-More-1.6.0-compat-compressed.js"></script>
     <script>
-        'use strict';
+        "use strict";
 
-        window.addEvent('domready', () => {
-            const paths = new URI().getData('paths').split('|');
-            $('cancelBtn').focus();
-            $('cancelBtn').addEvent('click', (e) => {
+        window.addEvent("domready", () => {
+            const paths = new URI().getData("paths").split("|");
+            $("cancelBtn").focus();
+            $("cancelBtn").addEvent("click", (e) => {
                 new Event(e).stop();
                 window.parent.qBittorrent.Client.closeWindows();
             });
-            $('confirmBtn').addEvent('click', (e) => {
+            $("confirmBtn").addEvent("click", (e) => {
                 new Event(e).stop();
                 let completionCount = 0;
                 paths.forEach((path) => {
                     new Request({
-                        url: 'api/v2/rss/removeItem',
-                        method: 'post',
+                        url: "api/v2/rss/removeItem",
+                        method: "post",
                         data: {
                             path: decodeURIComponent(path)
                         },

diff --git a/src/webui/www/private/confirmruleclear.html b/src/webui/www/private/confirmruleclear.html
@@ -8,25 +8,25 @@
     <script src="scripts/lib/MooTools-Core-1.6.0-compat-compressed.js"></script>
     <script src="scripts/lib/MooTools-More-1.6.0-compat-compressed.js"></script>
     <script>
-        'use strict';
+        "use strict";
 
-        window.addEvent('domready', () => {
-            const rules = new URI().getData('rules').split('|');
+        window.addEvent("domready", () => {
+            const rules = new URI().getData("rules").split("|");
 
-            $('cancelBtn').focus();
-            $('cancelBtn').addEvent('click', (e) => {
+            $("cancelBtn").focus();
+            $("cancelBtn").addEvent("click", (e) => {
                 new Event(e).stop();
-                window.parent.MochaUI.closeWindow(window.parent.$('clearRulesPage'));
+                window.parent.MochaUI.closeWindow(window.parent.$("clearRulesPage"));
             });
-            $('confirmBtn').addEvent('click', (e) => {
+            $("confirmBtn").addEvent("click", (e) => {
                 new Event(e).stop();
                 let completionCount = 0;
                 rules.forEach((rule) => {
-                    window.parent.qBittorrent.RssDownloader.modifyRuleState(decodeURIComponent(rule), 'previouslyMatchedEpisodes', [], () => {
+                    window.parent.qBittorrent.RssDownloader.modifyRuleState(decodeURIComponent(rule), "previouslyMatchedEpisodes", [], () => {
                         ++completionCount;
                         if (completionCount === rules.length) {
                             window.parent.qBittorrent.RssDownloader.updateRulesList();
-                            window.parent.MochaUI.closeWindow(window.parent.$('clearRulesPage'));
+                            window.parent.MochaUI.closeWindow(window.parent.$("clearRulesPage"));
                         }
                     });
                 });

diff --git a/src/webui/www/private/confirmruledeletion.html b/src/webui/www/private/confirmruledeletion.html
@@ -8,31 +8,31 @@
     <script src="scripts/lib/MooTools-Core-1.6.0-compat-compressed.js"></script>
     <script src="scripts/lib/MooTools-More-1.6.0-compat-compressed.js"></script>
     <script>
-        'use strict';
+        "use strict";
 
-        window.addEvent('domready', () => {
-            const rules = new URI().getData('rules').split('|');
+        window.addEvent("domready", () => {
+            const rules = new URI().getData("rules").split("|");
 
-            $('cancelBtn').focus();
-            $('cancelBtn').addEvent('click', (e) => {
+            $("cancelBtn").focus();
+            $("cancelBtn").addEvent("click", (e) => {
                 new Event(e).stop();
-                window.parent.MochaUI.closeWindow(window.parent.$('removeRulePage'));
+                window.parent.MochaUI.closeWindow(window.parent.$("removeRulePage"));
             });
-            $('confirmBtn').addEvent('click', (e) => {
+            $("confirmBtn").addEvent("click", (e) => {
                 new Event(e).stop();
                 let completionCount = 0;
                 rules.forEach((rule) => {
                     new Request({
-                        url: 'api/v2/rss/removeRule',
-                        method: 'post',
+                        url: "api/v2/rss/removeRule",
+                        method: "post",
                         data: {
                             ruleName: decodeURIComponent(rule)
                         },
                         onComplete: (response) => {
                             ++completionCount;
                             if (completionCount === rules.length) {
                                 window.parent.qBittorrent.RssDownloader.updateRulesList();
-                                window.parent.MochaUI.closeWindow(window.parent.$('removeRulePage'));
+                                window.parent.MochaUI.closeWindow(window.parent.$("removeRulePage"));
                             }
                         }
                     }).send();