From a395e6b3d36b51d0c3965108b0f56d85728e1c8d Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Thu, 30 Jul 2020 19:42:30 +0200 Subject: [PATCH] Remove redundant variable assignments --- src/components/appRouter.js | 3 +-- src/components/cardbuilder/chaptercardbuilder.js | 4 +--- src/components/playback/playbackmanager.js | 8 +++----- src/controllers/itemDetails/index.js | 11 +++-------- src/scripts/dom.js | 4 +--- src/scripts/libraryMenu.js | 4 +--- 6 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/components/appRouter.js b/src/components/appRouter.js index 138d58e5c..4fa2a9243 100644 --- a/src/components/appRouter.js +++ b/src/components/appRouter.js @@ -231,8 +231,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro max /= 8; max *= 1000000; max *= 0.7; - max = parseInt(max); - return max; + return parseInt(max, 10); } } /* eslint-enable compat/compat */ diff --git a/src/components/cardbuilder/chaptercardbuilder.js b/src/components/cardbuilder/chaptercardbuilder.js index 0215f8d8e..1521650ed 100644 --- a/src/components/cardbuilder/chaptercardbuilder.js +++ b/src/components/cardbuilder/chaptercardbuilder.js @@ -104,9 +104,7 @@ import browser from 'browser'; const cardBoxCssClass = 'cardBox'; const cardScalableClass = 'cardScalable'; - const html = ``; - - return html; + return ``; } export function buildChapterCards(item, chapters, options) { diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js index 0f3b0fbc5..9aaeb01c0 100644 --- a/src/components/playback/playbackmanager.js +++ b/src/components/playback/playbackmanager.js @@ -887,9 +887,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla } } - targets = targets.sort(sortPlayerTargets); - - return targets; + return targets.sort(sortPlayerTargets); }); }); }; @@ -3390,8 +3388,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla PlaybackManager.prototype.getSubtitleUrl = function (textStream, serverId) { var apiClient = connectionManager.getApiClient(serverId); - var textStreamUrl = !textStream.IsExternalUrl ? apiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl; - return textStreamUrl; + + return !textStream.IsExternalUrl ? apiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl; }; PlaybackManager.prototype.stop = function (player) { diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js index 29aa8ad1e..85f42109d 100644 --- a/src/controllers/itemDetails/index.js +++ b/src/controllers/itemDetails/index.js @@ -38,7 +38,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti } function getContextMenuOptions(item, user, button) { - var options = { + return { item: item, open: false, play: false, @@ -53,8 +53,6 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti user: user, share: true }; - - return options; } function getProgramScheduleHtml(items) { @@ -357,9 +355,8 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti }); html.push('' + artist.Name + ''); } - html = html.join(' / '); - return html; + return html.join(' / '); } /** @@ -1729,7 +1726,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti } function getVideosHtml(items) { - var html = cardBuilder.getCardsHtml({ + return cardBuilder.getCardsHtml({ items: items, shape: 'autooverflow', showTitle: true, @@ -1738,8 +1735,6 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti centerText: true, showRuntime: true }); - - return html; } function renderSpecials(page, item, user) { diff --git a/src/scripts/dom.js b/src/scripts/dom.js index 080bff66a..63935edbb 100644 --- a/src/scripts/dom.js +++ b/src/scripts/dom.js @@ -183,11 +183,9 @@ width = height * (16.0 / 9.0); } - const closest = standardWidths.sort(function (a, b) { + return standardWidths.sort(function (a, b) { return Math.abs(width - a) - Math.abs(width - b); })[0]; - - return closest; } /** diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js index 961d89dc0..da52be574 100644 --- a/src/scripts/libraryMenu.js +++ b/src/scripts/libraryMenu.js @@ -604,12 +604,10 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', ' var icon = i.icon || imageHelper.getLibraryIcon(i.CollectionType); var itemId = i.Id; - const linkHtml = ` + return ` ${i.Name} `; - - return linkHtml; }).join(''); libraryMenuOptions.innerHTML = html; var elem = libraryMenuOptions;