From e3c020870b8222948bd0c1fddfc5513f445f6a85 Mon Sep 17 00:00:00 2001
From: viown <48097677+viown@users.noreply.github.com>
Date: Wed, 20 Nov 2024 22:54:51 +0300
Subject: [PATCH] Cleanup listeners

---
 src/components/tvproviders/schedulesdirect.js | 10 +++++-----
 src/controllers/dashboard/library.js          |  8 ++++----
 src/controllers/dashboard/streaming.js        |  2 +-
 src/controllers/livetvstatus.js               |  8 ++++----
 src/controllers/wizard/start/index.js         |  4 ++--
 src/scripts/editorsidebar.js                  |  3 +--
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/components/tvproviders/schedulesdirect.js b/src/components/tvproviders/schedulesdirect.js
index 866e93e3b656..8536f93c1f19 100644
--- a/src/components/tvproviders/schedulesdirect.js
+++ b/src/components/tvproviders/schedulesdirect.js
@@ -223,7 +223,7 @@ export default function (page, providerId, options) {
         }).then(function (result) {
             page.querySelector('#selectListing').innerHTML = result.map(function (o) {
                 return '<option value="' + o.Id + '">' + o.Name + '</option>';
-            });
+            }).join('');
 
             if (listingsId) {
                 page.querySelector('#selectListing').value = listingsId;
@@ -257,14 +257,14 @@ export default function (page, providerId, options) {
         const hideSubmitButton = options.showSubmitButton === false;
         page.querySelector('.btnSubmitListings').classList.toggle('hide', hideSubmitButton);
 
-        page.querySelector('.formLogin').addEventListener('submit', function () {
+        page.querySelector('.formLogin').addEventListener('submit', function (e) {
+            e.preventDefault();
             submitLoginForm();
-            return false;
         });
 
-        page.querySelector('.formListings').addEventListener('submit', function () {
+        page.querySelector('.formListings').addEventListener('submit', function (e) {
+            e.preventDefault();
             submitListingsForm();
-                return false;
         });
 
         page.querySelector('.txtZipCode').addEventListener('change', function () {
diff --git a/src/controllers/dashboard/library.js b/src/controllers/dashboard/library.js
index 1d7c46d7b819..944818f96b56 100644
--- a/src/controllers/dashboard/library.js
+++ b/src/controllers/dashboard/library.js
@@ -185,8 +185,8 @@ function reloadVirtualFolders(page, virtualFolders) {
     btnCardMenuElements.forEach(function (btn) {
         btn.addEventListener('click', function () {
             showCardMenu(page, btn, virtualFolders);
-        })
-    })
+        });
+    });
     divVirtualFolders.querySelector('#addLibrary').addEventListener('click', function () {
         addVirtualFolder(page);
     });
@@ -201,8 +201,8 @@ function reloadVirtualFolders(page, virtualFolders) {
             if (virtualFolder.ItemId) {
                 editVirtualFolder(page, virtualFolder);
             }
-        })
-    })
+        });
+    });
     loading.hide();
 }
 
diff --git a/src/controllers/dashboard/streaming.js b/src/controllers/dashboard/streaming.js
index 3c08107e2011..9dab432cba48 100644
--- a/src/controllers/dashboard/streaming.js
+++ b/src/controllers/dashboard/streaming.js
@@ -11,7 +11,7 @@ function onSubmit() {
     loading.show();
     const form = this;
     ApiClient.getServerConfiguration().then(function (config) {
-        config.RemoteClientBitrateLimit = parseInt(1e6 * parseFloat(form.querySelector('#txtRemoteClientBitrateLimit', form).value || '0'), 10);
+        config.RemoteClientBitrateLimit = parseInt(1e6 * parseFloat(form.querySelector('#txtRemoteClientBitrateLimit').value || '0'), 10);
         ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult);
     });
 
diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js
index ea22c8c50924..cdcd84ee8bd4 100644
--- a/src/controllers/livetvstatus.js
+++ b/src/controllers/livetvstatus.js
@@ -137,8 +137,8 @@ function renderProviders(page, providers) {
             btn.addEventListener('click', function () {
                 const id = this.getAttribute('data-id');
                 showProviderOptions(page, id, btn);
-            })
-        })
+            });
+        });
     }
 }
 
@@ -308,9 +308,9 @@ $(document).on('pageinit', '#liveTvStatusPage', function () {
     });
     if (page.querySelector('.formAddDevice')) {
         // unused?
-        page.querySelector('.formAddDevice').addEventListener('submit', function () {
+        page.querySelector('.formAddDevice').addEventListener('submit', function (e) {
+            e.preventDefault();
             submitAddDeviceForm(page);
-            return false;
         });
     }
     page.querySelector('.btnAddProvider').addEventListener('click', function () {
diff --git a/src/controllers/wizard/start/index.js b/src/controllers/wizard/start/index.js
index b323b148ee00..4eb6423b645f 100644
--- a/src/controllers/wizard/start/index.js
+++ b/src/controllers/wizard/start/index.js
@@ -30,9 +30,9 @@ function save(page) {
     });
 }
 
-function onSubmit() {
+function onSubmit(e) {
+    e.preventDefault();
     save(dom.parentWithClass(this, 'page'));
-    return false;
 }
 
 export default function (view) {
diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js
index a033ced51927..28fb86191742 100644
--- a/src/scripts/editorsidebar.js
+++ b/src/scripts/editorsidebar.js
@@ -5,7 +5,6 @@ import 'material-design-icons-iconfont';
 import globalize from 'lib/globalize';
 import Dashboard from 'utils/dashboard';
 import { getParameterByName } from 'utils/url';
-import dom from './dom';
 
 function getNode(item, folderState, selected) {
     const htmlName = getNodeInnerHtml(item);
@@ -216,7 +215,7 @@ function onNodeSelect(event, data) {
 }
 
 function onNodeOpen(_, data) {
-    const page = dom.parentWithClass(this, 'page');
+    const page = $(this).parents('.page')[0];
     const node = data.node;
     if (node.children) {
         loadNodesToLoad(page, node);