From ac62a5e8bf3fe6e7792d5e183c716e915a078aad Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Wed, 4 May 2022 03:36:40 +0300 Subject: [PATCH 1/4] use import for ItemsByName & PlaylistViewer --- .eslintrc.js | 1 - src/controllers/itemDetails/index.js | 6 ++--- src/scripts/itembynamedetailpage.js | 4 +++- .../{playlistedit.js => playlistViewer.js} | 22 +++++++++++-------- 4 files changed, 19 insertions(+), 14 deletions(-) rename src/scripts/{playlistedit.js => playlistViewer.js} (75%) diff --git a/.eslintrc.js b/.eslintrc.js index 188fee87c2..5c1c881c9e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -215,7 +215,6 @@ module.exports = { 'LiveTvHelpers': 'writable', 'Loading': 'writable', 'MetadataEditor': 'writable', - 'PlaylistViewer': 'writable', 'ServerNotifications': 'writable', 'TaskButton': 'writable', 'UserParentalControlPage': 'writable', diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js index ad8bbb063e..2564315de8 100644 --- a/src/controllers/itemDetails/index.js +++ b/src/controllers/itemDetails/index.js @@ -1507,13 +1507,13 @@ function renderChildren(page, item) { } function renderItemsByName(page, item) { - import('../../scripts/itembynamedetailpage').then(() => { - window.ItemsByName.renderItems(page, item); + import('../../scripts/itembynamedetailpage').then(({ default: ItemsByName }) => { + ItemsByName.renderItems(page, item); }); } function renderPlaylistItems(page, item) { - import('../../scripts/playlistedit').then(() => { + import('../../scripts/playlistViewer').then(({ default: PlaylistViewer }) => { PlaylistViewer.render(page, item); }); } diff --git a/src/scripts/itembynamedetailpage.js b/src/scripts/itembynamedetailpage.js index 3fb575bc42..10734ec176 100644 --- a/src/scripts/itembynamedetailpage.js +++ b/src/scripts/itembynamedetailpage.js @@ -373,6 +373,8 @@ function getItemsFunction(options, item) { }; } -window.ItemsByName = { +const ItemsByName = { renderItems: renderItems }; + +export default ItemsByName; diff --git a/src/scripts/playlistedit.js b/src/scripts/playlistViewer.js similarity index 75% rename from src/scripts/playlistedit.js rename to src/scripts/playlistViewer.js index 7b6b05b291..416469f58e 100644 --- a/src/scripts/playlistedit.js +++ b/src/scripts/playlistViewer.js @@ -35,14 +35,18 @@ function init(page, item) { elem.getItemsHtml = getItemsHtmlFn(item.Id); } -window.PlaylistViewer = { - render: function (page, item) { - if (!page.playlistInit) { - page.playlistInit = true; - init(page, item); - } - - page.querySelector('#childrenContent').classList.add('verticalSection-extrabottompadding'); - page.querySelector('#childrenContent .itemsContainer').refreshItems(); +function render(page, item) { + if (!page.playlistInit) { + page.playlistInit = true; + init(page, item); } + + page.querySelector('#childrenContent').classList.add('verticalSection-extrabottompadding'); + page.querySelector('#childrenContent .itemsContainer').refreshItems(); +} + +const PlaylistViewer = { + render: render }; + +export default PlaylistViewer; From 6cdbaa9f4e199eaa8f906a36a5e14ac9b36dbc96 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Wed, 4 May 2022 03:48:27 +0300 Subject: [PATCH 2/4] Rename itembynamedetailpage to itemsByName --- src/controllers/itemDetails/index.js | 2 +- src/scripts/{itembynamedetailpage.js => itemsByName.js} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/scripts/{itembynamedetailpage.js => itemsByName.js} (100%) diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js index 2564315de8..eb8c91f09b 100644 --- a/src/controllers/itemDetails/index.js +++ b/src/controllers/itemDetails/index.js @@ -1507,7 +1507,7 @@ function renderChildren(page, item) { } function renderItemsByName(page, item) { - import('../../scripts/itembynamedetailpage').then(({ default: ItemsByName }) => { + import('../../scripts/itemsByName').then(({ default: ItemsByName }) => { ItemsByName.renderItems(page, item); }); } diff --git a/src/scripts/itembynamedetailpage.js b/src/scripts/itemsByName.js similarity index 100% rename from src/scripts/itembynamedetailpage.js rename to src/scripts/itemsByName.js From ee495cd41280e318eb011bd8c07a73369badf3d6 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Fri, 6 May 2022 23:33:06 +0300 Subject: [PATCH 3/4] Remove unused parameter "page" --- src/scripts/itemsByName.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/itemsByName.js b/src/scripts/itemsByName.js index 10734ec176..9601b87bc0 100644 --- a/src/scripts/itemsByName.js +++ b/src/scripts/itemsByName.js @@ -89,11 +89,11 @@ function renderItems(page, item) { const sectionElems = elem.querySelectorAll('.verticalSection'); for (let i = 0, length = sectionElems.length; i < length; i++) { - renderSection(page, item, sectionElems[i], sectionElems[i].getAttribute('data-type')); + renderSection(item, sectionElems[i], sectionElems[i].getAttribute('data-type')); } } -function renderSection(page, item, element, type) { +function renderSection(item, element, type) { switch (type) { case 'Program': loadItems(element, item, type, { From bca185e1a987ac8a4f0079cef05b2bb8f4228200 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Mon, 9 May 2022 19:03:55 +0300 Subject: [PATCH 4/4] apply suggestions --- src/scripts/itemsByName.js | 2 +- src/scripts/playlistViewer.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/itemsByName.js b/src/scripts/itemsByName.js index 9601b87bc0..b0ead111d2 100644 --- a/src/scripts/itemsByName.js +++ b/src/scripts/itemsByName.js @@ -374,7 +374,7 @@ function getItemsFunction(options, item) { } const ItemsByName = { - renderItems: renderItems + renderItems }; export default ItemsByName; diff --git a/src/scripts/playlistViewer.js b/src/scripts/playlistViewer.js index 416469f58e..16844ee8c8 100644 --- a/src/scripts/playlistViewer.js +++ b/src/scripts/playlistViewer.js @@ -46,7 +46,7 @@ function render(page, item) { } const PlaylistViewer = { - render: render + render }; export default PlaylistViewer;