From 87f47d80014754b71bdac42e7fa60cc1b10cd8b0 Mon Sep 17 00:00:00 2001 From: sancodes Date: Mon, 21 Mar 2022 20:49:47 -0700 Subject: [PATCH 1/5] add no-void lint --- .eslintrc.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index f5c83f13dc..ec9bb4b5aa 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -58,7 +58,8 @@ module.exports = { 'no-var': ['error'], 'space-before-blocks': ['error'], 'space-infix-ops': 'error', - 'yoda': 'error' + 'yoda': 'error', + 'no-void': ['error', { "allowAsStatement": true }] }, settings: { react: { From 408f2b2bdadde07504d25fe312fbd5ca014705c0 Mon Sep 17 00:00:00 2001 From: sancodes Date: Mon, 21 Mar 2022 20:50:19 -0700 Subject: [PATCH 2/5] modify necessary void replacements --- .../accessSchedule/accessSchedule.js | 2 +- src/components/groupedcards.js | 2 +- .../libraryoptionseditor.js | 2 +- src/components/tvproviders/schedulesdirect.js | 4 +-- src/controllers/dashboard/dashboard.js | 3 +- src/controllers/itemDetails/index.js | 30 ++++++++++--------- src/controllers/list.js | 2 +- src/controllers/playback/video/index.js | 6 ++-- .../session/forgotPassword/index.js | 6 ++-- .../session/resetPassword/index.js | 2 +- src/scripts/libraryMenu.js | 4 +-- 11 files changed, 33 insertions(+), 30 deletions(-) diff --git a/src/components/accessSchedule/accessSchedule.js b/src/components/accessSchedule/accessSchedule.js index 38f0491850..561483cde3 100644 --- a/src/components/accessSchedule/accessSchedule.js +++ b/src/components/accessSchedule/accessSchedule.js @@ -51,7 +51,7 @@ import template from './accessSchedule.template.html'; }; if (parseFloat(updatedSchedule.StartHour) >= parseFloat(updatedSchedule.EndHour)) { - return void alert(globalize.translate('ErrorStartHourGreaterThanEnd')); + return alert(globalize.translate('ErrorStartHourGreaterThanEnd')); } context.submitted = true; diff --git a/src/components/groupedcards.js b/src/components/groupedcards.js index 13158016ac..25dd784305 100644 --- a/src/components/groupedcards.js +++ b/src/components/groupedcards.js @@ -23,7 +23,7 @@ import ServerConnections from './ServerConnections'; if (!actionableParent || actionableParent.classList.contains('cardContent')) { apiClient.getJSON(apiClient.getUrl('Users/' + userId + '/Items/Latest', options)).then(function (items) { if (items.length === 1) { - return void appRouter.showItem(items[0]); + return appRouter.showItem(items[0]); } const url = 'details?id=' + itemId + '&serverId=' + serverId; diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js index 59478280a9..1f246c8a62 100644 --- a/src/components/libraryoptionseditor/libraryoptionseditor.js +++ b/src/components/libraryoptionseditor/libraryoptionseditor.js @@ -323,7 +323,7 @@ import template from './libraryoptionseditor.template.html'; function onImageFetchersContainerClick(e) { const btnImageOptionsForType = dom.parentWithClass(e.target, 'btnImageOptionsForType'); if (btnImageOptionsForType) { - return void showImageOptionsForType(dom.parentWithClass(btnImageOptionsForType, 'imageFetcher').getAttribute('data-type')); + return showImageOptionsForType(dom.parentWithClass(btnImageOptionsForType, 'imageFetcher').getAttribute('data-type')); } onSortableContainerClick.call(this, e); } diff --git a/src/components/tvproviders/schedulesdirect.js b/src/components/tvproviders/schedulesdirect.js index 1d0e8a49f2..df33008aca 100644 --- a/src/components/tvproviders/schedulesdirect.js +++ b/src/components/tvproviders/schedulesdirect.js @@ -122,7 +122,7 @@ export default function (page, providerId, options) { const selectedListingsId = $('#selectListing', page).val(); if (!selectedListingsId) { - return void Dashboard.alert({ + return Dashboard.alert({ message: globalize.translate('ErrorPleaseSelectLineup') }); } @@ -168,7 +168,7 @@ export default function (page, providerId, options) { function refreshListings(value) { if (!value) { - return void $('#selectListing', page).html(''); + return $('#selectListing', page).html(''); } loading.show(); diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js index d4110b05ef..8d5e3730e4 100644 --- a/src/controllers/dashboard/dashboard.js +++ b/src/controllers/dashboard/dashboard.js @@ -175,7 +175,8 @@ import confirm from '../../components/confirm/confirm'; if (!result.Items.length) { view.querySelector('.activeRecordingsSection').classList.add('hide'); - return void(itemsContainer.innerHTML = ''); + itemsContainer.innerHTML = ''; + return undefined; } view.querySelector('.activeRecordingsSection').classList.remove('hide'); diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js index 762d4ce83e..48a3a57e6e 100644 --- a/src/controllers/itemDetails/index.js +++ b/src/controllers/itemDetails/index.js @@ -140,7 +140,7 @@ function renderSeriesTimerSchedule(page, apiClient, seriesTimerId) { function renderTimerEditor(page, item, apiClient, user) { if (item.Type !== 'Recording' || !user.Policy.EnableLiveTvManagement || !item.TimerId || item.Status !== 'InProgress') { - return void hideAll(page, 'btnCancelTimer'); + return hideAll(page, 'btnCancelTimer'); } hideAll(page, 'btnCancelTimer', true); @@ -148,7 +148,7 @@ function renderTimerEditor(page, item, apiClient, user) { function renderSeriesTimerEditor(page, item, apiClient, user) { if (item.Type !== 'SeriesTimer') { - return void hideAll(page, 'btnCancelSeriesTimer'); + return hideAll(page, 'btnCancelSeriesTimer'); } if (user.Policy.EnableLiveTvManagement) { @@ -160,11 +160,11 @@ function renderSeriesTimerEditor(page, item, apiClient, user) { page.querySelector('.seriesTimerScheduleSection').classList.remove('hide'); hideAll(page, 'btnCancelSeriesTimer', true); - return void renderSeriesTimerSchedule(page, apiClient, item.Id); + return renderSeriesTimerSchedule(page, apiClient, item.Id); } page.querySelector('.seriesTimerScheduleSection').classList.add('hide'); - return void hideAll(page, 'btnCancelSeriesTimer'); + return hideAll(page, 'btnCancelSeriesTimer'); } function renderTrackSelections(page, instance, item, forceReload) { @@ -806,7 +806,8 @@ function renderNextUp(page, item, user) { const section = page.querySelector('.nextUpSection'); if (item.Type != 'Series') { - return void section.classList.add('hide'); + section.classList.add('hide'); + return undefined; } ServerConnections.getApiClient(item.ServerId).getNextUpEpisodes({ @@ -1113,7 +1114,7 @@ function renderMoreFromSeason(view, item, apiClient) { if (section) { if (item.Type !== 'Episode' || !item.SeasonId || !item.SeriesId) { - return void section.classList.add('hide'); + return section.classList.add('hide'); } const userId = apiClient.getCurrentUserId(); @@ -1123,7 +1124,7 @@ function renderMoreFromSeason(view, item, apiClient) { Fields: 'ItemCounts,PrimaryImageAspectRatio,BasicSyncInfo,CanDelete,MediaSourceCount' }).then(function (result) { if (result.Items.length < 2) { - return void section.classList.add('hide'); + return section.classList.add('hide'); } section.classList.remove('hide'); @@ -1158,10 +1159,10 @@ function renderMoreFromArtist(view, item, apiClient) { if (section) { if (item.Type === 'MusicArtist') { if (!apiClient.isMinServerVersion('3.4.1.19')) { - return void section.classList.add('hide'); + return section.classList.add('hide'); } } else if (item.Type !== 'MusicAlbum' || !item.AlbumArtists || !item.AlbumArtists.length) { - return void section.classList.add('hide'); + return section.classList.add('hide'); } const query = { @@ -1180,7 +1181,7 @@ function renderMoreFromArtist(view, item, apiClient) { apiClient.getItems(apiClient.getCurrentUserId(), query).then(function (result) { if (!result.Items.length) { - return void section.classList.add('hide'); + return section.classList.add('hide'); } section.classList.remove('hide'); @@ -1214,7 +1215,7 @@ function renderSimilarItems(page, item, context) { if (similarCollapsible) { if (item.Type != 'Movie' && item.Type != 'Trailer' && item.Type != 'Series' && item.Type != 'Program' && item.Type != 'Recording' && item.Type != 'MusicAlbum' && item.Type != 'MusicArtist' && item.Type != 'Playlist') { - return void similarCollapsible.classList.add('hide'); + return similarCollapsible.classList.add('hide'); } similarCollapsible.classList.remove('hide'); @@ -1231,7 +1232,7 @@ function renderSimilarItems(page, item, context) { apiClient.getSimilarItems(item.Id, options).then(function (result) { if (!result.Items.length) { - return void similarCollapsible.classList.add('hide'); + return similarCollapsible.classList.add('hide'); } similarCollapsible.classList.remove('hide'); @@ -1818,7 +1819,8 @@ function renderCast(page, item) { }); if (!people.length) { - return void page.querySelector('#castCollapsible').classList.add('hide'); + page.querySelector('#castCollapsible').classList.add('hide'); + return undefined; } page.querySelector('#castCollapsible').classList.remove('hide'); @@ -1913,7 +1915,7 @@ export default function (view, params) { if (item.Type === 'Program') { const apiClient = ServerConnections.getApiClient(item.ServerId); - return void apiClient.getLiveTvChannel(item.ChannelId, apiClient.getCurrentUserId()).then(function (channel) { + return apiClient.getLiveTvChannel(item.ChannelId, apiClient.getCurrentUserId()).then(function (channel) { playbackManager.play({ items: [channel] }); diff --git a/src/controllers/list.js b/src/controllers/list.js index 105817605b..f465d55b57 100644 --- a/src/controllers/list.js +++ b/src/controllers/list.js @@ -721,7 +721,7 @@ class ItemsView { return globalize.translate('Videos'); } - return void 0; + return undefined; } function play() { diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js index a27e119768..134d30f413 100644 --- a/src/controllers/playback/video/index.js +++ b/src/controllers/playback/video/index.js @@ -54,14 +54,14 @@ import { appRouter } from '../../../components/appRouter'; recordingButtonManager = null; } - return void view.querySelector('.btnRecord').classList.add('hide'); + return view.querySelector('.btnRecord').classList.add('hide'); } ServerConnections.getApiClient(item.ServerId).getCurrentUser().then(function (user) { if (user.Policy.EnableLiveTvManagement) { import('../../../components/recordingcreator/recordingbutton').then(({default: RecordingButton}) => { if (recordingButtonManager) { - return void recordingButtonManager.refreshItem(item); + return recordingButtonManager.refreshItem(item); } recordingButtonManager = new RecordingButton({ @@ -1449,7 +1449,7 @@ import { appRouter } from '../../../components/appRouter'; /* eslint-disable-next-line compat/compat */ dom.addEventListener(view, window.PointerEvent ? 'pointerdown' : 'click', function (e) { if (dom.parentWithClass(e.target, ['videoOsdBottom', 'upNextContainer'])) { - return void showOsd(); + return showOsd(); } const pointerType = e.pointerType || (layoutManager.mobile ? 'touch' : 'mouse'); diff --git a/src/controllers/session/forgotPassword/index.js b/src/controllers/session/forgotPassword/index.js index 0b165b65f5..9f02a62c1a 100644 --- a/src/controllers/session/forgotPassword/index.js +++ b/src/controllers/session/forgotPassword/index.js @@ -5,14 +5,14 @@ import Dashboard from '../../../scripts/clientUtils'; function processForgotPasswordResult(result) { if (result.Action == 'ContactAdmin') { - return void Dashboard.alert({ + return Dashboard.alert({ message: globalize.translate('MessageContactAdminToResetPassword'), title: globalize.translate('ButtonForgotPassword') }); } if (result.Action == 'InNetworkRequired') { - return void Dashboard.alert({ + return Dashboard.alert({ message: globalize.translate('MessageForgotPasswordInNetworkRequired'), title: globalize.translate('ButtonForgotPassword') }); @@ -26,7 +26,7 @@ import Dashboard from '../../../scripts/clientUtils'; msg += '
'; msg += result.PinFile; msg += '
'; - return void Dashboard.alert({ + return Dashboard.alert({ message: msg, title: globalize.translate('ButtonForgotPassword'), callback: function () { diff --git a/src/controllers/session/resetPassword/index.js b/src/controllers/session/resetPassword/index.js index 9697e386a7..252798fd7e 100644 --- a/src/controllers/session/resetPassword/index.js +++ b/src/controllers/session/resetPassword/index.js @@ -9,7 +9,7 @@ import Dashboard from '../../../scripts/clientUtils'; msg += '
'; msg += '
'; msg += result.UsersReset.join('
'); - return void Dashboard.alert({ + return Dashboard.alert({ message: msg, title: globalize.translate('HeaderPasswordReset'), callback: function () { diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js index f4051ea83c..c3b2400ba3 100644 --- a/src/scripts/libraryMenu.js +++ b/src/scripts/libraryMenu.js @@ -645,7 +645,7 @@ import Headroom from 'headroom.js'; if (!user) { showBySelector('.libraryMenuDownloads', false); showBySelector('.lnkSyncToOtherDevices', false); - return void showBySelector('.userMenuOptions', false); + return showBySelector('.userMenuOptions', false); } if (user.Policy.EnableContentDownloading) { @@ -957,7 +957,7 @@ import Headroom from 'headroom.js'; function setTitle (title) { if (title == null) { - return void LibraryMenu.setDefaultTitle(); + return LibraryMenu.setDefaultTitle(); } if (title === '-') { From 95423468bb1b6ec833e58e4d3992b81f17ada297 Mon Sep 17 00:00:00 2001 From: sancodes Date: Sun, 3 Apr 2022 12:08:10 -0700 Subject: [PATCH 3/5] fix return --- src/components/accessSchedule/accessSchedule.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/accessSchedule/accessSchedule.js b/src/components/accessSchedule/accessSchedule.js index 561483cde3..4253247fa4 100644 --- a/src/components/accessSchedule/accessSchedule.js +++ b/src/components/accessSchedule/accessSchedule.js @@ -51,7 +51,8 @@ import template from './accessSchedule.template.html'; }; if (parseFloat(updatedSchedule.StartHour) >= parseFloat(updatedSchedule.EndHour)) { - return alert(globalize.translate('ErrorStartHourGreaterThanEnd')); + alert(globalize.translate('ErrorStartHourGreaterThanEnd')); + return; } context.submitted = true; From 161f5315235a98a1dafe134e298bb0d15dfb84b4 Mon Sep 17 00:00:00 2001 From: sancodes Date: Sun, 3 Apr 2022 12:08:26 -0700 Subject: [PATCH 4/5] fix return --- src/controllers/dashboard/dashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js index 8d5e3730e4..a8946273c6 100644 --- a/src/controllers/dashboard/dashboard.js +++ b/src/controllers/dashboard/dashboard.js @@ -176,7 +176,7 @@ import confirm from '../../components/confirm/confirm'; if (!result.Items.length) { view.querySelector('.activeRecordingsSection').classList.add('hide'); itemsContainer.innerHTML = ''; - return undefined; + return; } view.querySelector('.activeRecordingsSection').classList.remove('hide'); From 27cd24f5fc994f026ca1f176811f48ba15795c71 Mon Sep 17 00:00:00 2001 From: sancodes Date: Fri, 8 Apr 2022 19:10:11 -0700 Subject: [PATCH 5/5] fix return statements --- src/components/groupedcards.js | 3 +- .../libraryoptionseditor.js | 3 +- src/components/tvproviders/schedulesdirect.js | 6 ++- src/controllers/itemDetails/index.js | 40 ++++++++++++------- src/controllers/list.js | 2 +- src/controllers/playback/video/index.js | 9 +++-- .../session/forgotPassword/index.js | 9 +++-- .../session/resetPassword/index.js | 3 +- src/scripts/libraryMenu.js | 6 ++- 9 files changed, 53 insertions(+), 28 deletions(-) diff --git a/src/components/groupedcards.js b/src/components/groupedcards.js index 25dd784305..4662648485 100644 --- a/src/components/groupedcards.js +++ b/src/components/groupedcards.js @@ -23,7 +23,8 @@ import ServerConnections from './ServerConnections'; if (!actionableParent || actionableParent.classList.contains('cardContent')) { apiClient.getJSON(apiClient.getUrl('Users/' + userId + '/Items/Latest', options)).then(function (items) { if (items.length === 1) { - return appRouter.showItem(items[0]); + appRouter.showItem(items[0]); + return; } const url = 'details?id=' + itemId + '&serverId=' + serverId; diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js index 1f246c8a62..597d747840 100644 --- a/src/components/libraryoptionseditor/libraryoptionseditor.js +++ b/src/components/libraryoptionseditor/libraryoptionseditor.js @@ -323,7 +323,8 @@ import template from './libraryoptionseditor.template.html'; function onImageFetchersContainerClick(e) { const btnImageOptionsForType = dom.parentWithClass(e.target, 'btnImageOptionsForType'); if (btnImageOptionsForType) { - return showImageOptionsForType(dom.parentWithClass(btnImageOptionsForType, 'imageFetcher').getAttribute('data-type')); + showImageOptionsForType(dom.parentWithClass(btnImageOptionsForType, 'imageFetcher').getAttribute('data-type')); + return; } onSortableContainerClick.call(this, e); } diff --git a/src/components/tvproviders/schedulesdirect.js b/src/components/tvproviders/schedulesdirect.js index df33008aca..e9770e287f 100644 --- a/src/components/tvproviders/schedulesdirect.js +++ b/src/components/tvproviders/schedulesdirect.js @@ -122,9 +122,10 @@ export default function (page, providerId, options) { const selectedListingsId = $('#selectListing', page).val(); if (!selectedListingsId) { - return Dashboard.alert({ + Dashboard.alert({ message: globalize.translate('ErrorPleaseSelectLineup') }); + return; } loading.show(); @@ -168,7 +169,8 @@ export default function (page, providerId, options) { function refreshListings(value) { if (!value) { - return $('#selectListing', page).html(''); + $('#selectListing', page).html(''); + return; } loading.show(); diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js index 48a3a57e6e..a84fbc63d4 100644 --- a/src/controllers/itemDetails/index.js +++ b/src/controllers/itemDetails/index.js @@ -140,7 +140,8 @@ function renderSeriesTimerSchedule(page, apiClient, seriesTimerId) { function renderTimerEditor(page, item, apiClient, user) { if (item.Type !== 'Recording' || !user.Policy.EnableLiveTvManagement || !item.TimerId || item.Status !== 'InProgress') { - return hideAll(page, 'btnCancelTimer'); + hideAll(page, 'btnCancelTimer'); + return; } hideAll(page, 'btnCancelTimer', true); @@ -148,7 +149,8 @@ function renderTimerEditor(page, item, apiClient, user) { function renderSeriesTimerEditor(page, item, apiClient, user) { if (item.Type !== 'SeriesTimer') { - return hideAll(page, 'btnCancelSeriesTimer'); + hideAll(page, 'btnCancelSeriesTimer'); + return; } if (user.Policy.EnableLiveTvManagement) { @@ -160,11 +162,13 @@ function renderSeriesTimerEditor(page, item, apiClient, user) { page.querySelector('.seriesTimerScheduleSection').classList.remove('hide'); hideAll(page, 'btnCancelSeriesTimer', true); - return renderSeriesTimerSchedule(page, apiClient, item.Id); + renderSeriesTimerSchedule(page, apiClient, item.Id); + return; } page.querySelector('.seriesTimerScheduleSection').classList.add('hide'); - return hideAll(page, 'btnCancelSeriesTimer'); + hideAll(page, 'btnCancelSeriesTimer'); + return; } function renderTrackSelections(page, instance, item, forceReload) { @@ -807,7 +811,7 @@ function renderNextUp(page, item, user) { if (item.Type != 'Series') { section.classList.add('hide'); - return undefined; + return; } ServerConnections.getApiClient(item.ServerId).getNextUpEpisodes({ @@ -1114,7 +1118,8 @@ function renderMoreFromSeason(view, item, apiClient) { if (section) { if (item.Type !== 'Episode' || !item.SeasonId || !item.SeriesId) { - return section.classList.add('hide'); + section.classList.add('hide'); + return; } const userId = apiClient.getCurrentUserId(); @@ -1124,7 +1129,8 @@ function renderMoreFromSeason(view, item, apiClient) { Fields: 'ItemCounts,PrimaryImageAspectRatio,BasicSyncInfo,CanDelete,MediaSourceCount' }).then(function (result) { if (result.Items.length < 2) { - return section.classList.add('hide'); + section.classList.add('hide'); + return; } section.classList.remove('hide'); @@ -1159,10 +1165,12 @@ function renderMoreFromArtist(view, item, apiClient) { if (section) { if (item.Type === 'MusicArtist') { if (!apiClient.isMinServerVersion('3.4.1.19')) { - return section.classList.add('hide'); + section.classList.add('hide'); + return; } } else if (item.Type !== 'MusicAlbum' || !item.AlbumArtists || !item.AlbumArtists.length) { - return section.classList.add('hide'); + section.classList.add('hide'); + return; } const query = { @@ -1181,7 +1189,8 @@ function renderMoreFromArtist(view, item, apiClient) { apiClient.getItems(apiClient.getCurrentUserId(), query).then(function (result) { if (!result.Items.length) { - return section.classList.add('hide'); + section.classList.add('hide'); + return; } section.classList.remove('hide'); @@ -1215,7 +1224,8 @@ function renderSimilarItems(page, item, context) { if (similarCollapsible) { if (item.Type != 'Movie' && item.Type != 'Trailer' && item.Type != 'Series' && item.Type != 'Program' && item.Type != 'Recording' && item.Type != 'MusicAlbum' && item.Type != 'MusicArtist' && item.Type != 'Playlist') { - return similarCollapsible.classList.add('hide'); + similarCollapsible.classList.add('hide'); + return; } similarCollapsible.classList.remove('hide'); @@ -1232,7 +1242,8 @@ function renderSimilarItems(page, item, context) { apiClient.getSimilarItems(item.Id, options).then(function (result) { if (!result.Items.length) { - return similarCollapsible.classList.add('hide'); + similarCollapsible.classList.add('hide'); + return; } similarCollapsible.classList.remove('hide'); @@ -1820,7 +1831,7 @@ function renderCast(page, item) { if (!people.length) { page.querySelector('#castCollapsible').classList.add('hide'); - return undefined; + return; } page.querySelector('#castCollapsible').classList.remove('hide'); @@ -1915,11 +1926,12 @@ export default function (view, params) { if (item.Type === 'Program') { const apiClient = ServerConnections.getApiClient(item.ServerId); - return apiClient.getLiveTvChannel(item.ChannelId, apiClient.getCurrentUserId()).then(function (channel) { + apiClient.getLiveTvChannel(item.ChannelId, apiClient.getCurrentUserId()).then(function (channel) { playbackManager.play({ items: [channel] }); }); + return; } playItem(item, item.UserData && mode === 'resume' ? item.UserData.PlaybackPositionTicks : 0); diff --git a/src/controllers/list.js b/src/controllers/list.js index f465d55b57..3a03a854dd 100644 --- a/src/controllers/list.js +++ b/src/controllers/list.js @@ -721,7 +721,7 @@ class ItemsView { return globalize.translate('Videos'); } - return undefined; + return; } function play() { diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js index 134d30f413..1cb2f4cff7 100644 --- a/src/controllers/playback/video/index.js +++ b/src/controllers/playback/video/index.js @@ -54,14 +54,16 @@ import { appRouter } from '../../../components/appRouter'; recordingButtonManager = null; } - return view.querySelector('.btnRecord').classList.add('hide'); + view.querySelector('.btnRecord').classList.add('hide'); + return; } ServerConnections.getApiClient(item.ServerId).getCurrentUser().then(function (user) { if (user.Policy.EnableLiveTvManagement) { import('../../../components/recordingcreator/recordingbutton').then(({default: RecordingButton}) => { if (recordingButtonManager) { - return recordingButtonManager.refreshItem(item); + recordingButtonManager.refreshItem(item); + return; } recordingButtonManager = new RecordingButton({ @@ -1449,7 +1451,8 @@ import { appRouter } from '../../../components/appRouter'; /* eslint-disable-next-line compat/compat */ dom.addEventListener(view, window.PointerEvent ? 'pointerdown' : 'click', function (e) { if (dom.parentWithClass(e.target, ['videoOsdBottom', 'upNextContainer'])) { - return showOsd(); + showOsd(); + return; } const pointerType = e.pointerType || (layoutManager.mobile ? 'touch' : 'mouse'); diff --git a/src/controllers/session/forgotPassword/index.js b/src/controllers/session/forgotPassword/index.js index 9f02a62c1a..a0d2b7192e 100644 --- a/src/controllers/session/forgotPassword/index.js +++ b/src/controllers/session/forgotPassword/index.js @@ -5,17 +5,19 @@ import Dashboard from '../../../scripts/clientUtils'; function processForgotPasswordResult(result) { if (result.Action == 'ContactAdmin') { - return Dashboard.alert({ + Dashboard.alert({ message: globalize.translate('MessageContactAdminToResetPassword'), title: globalize.translate('ButtonForgotPassword') }); + return; } if (result.Action == 'InNetworkRequired') { - return Dashboard.alert({ + Dashboard.alert({ message: globalize.translate('MessageForgotPasswordInNetworkRequired'), title: globalize.translate('ButtonForgotPassword') }); + return; } if (result.Action == 'PinCode') { @@ -26,13 +28,14 @@ import Dashboard from '../../../scripts/clientUtils'; msg += '
'; msg += result.PinFile; msg += '
'; - return Dashboard.alert({ + Dashboard.alert({ message: msg, title: globalize.translate('ButtonForgotPassword'), callback: function () { Dashboard.navigate('forgotpasswordpin.html'); } }); + return; } } diff --git a/src/controllers/session/resetPassword/index.js b/src/controllers/session/resetPassword/index.js index 252798fd7e..fea8e9ca6d 100644 --- a/src/controllers/session/resetPassword/index.js +++ b/src/controllers/session/resetPassword/index.js @@ -9,13 +9,14 @@ import Dashboard from '../../../scripts/clientUtils'; msg += '
'; msg += '
'; msg += result.UsersReset.join('
'); - return Dashboard.alert({ + Dashboard.alert({ message: msg, title: globalize.translate('HeaderPasswordReset'), callback: function () { window.location.href = 'index.html'; } }); + return; } Dashboard.alert({ diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js index c3b2400ba3..6603905982 100644 --- a/src/scripts/libraryMenu.js +++ b/src/scripts/libraryMenu.js @@ -645,7 +645,8 @@ import Headroom from 'headroom.js'; if (!user) { showBySelector('.libraryMenuDownloads', false); showBySelector('.lnkSyncToOtherDevices', false); - return showBySelector('.userMenuOptions', false); + showBySelector('.userMenuOptions', false); + return; } if (user.Policy.EnableContentDownloading) { @@ -957,7 +958,8 @@ import Headroom from 'headroom.js'; function setTitle (title) { if (title == null) { - return LibraryMenu.setDefaultTitle(); + LibraryMenu.setDefaultTitle(); + return; } if (title === '-') {