1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Merge pull request #4704 from thornbill/eslint-sonar-updates

This commit is contained in:
Bill Thornton 2023-07-08 00:53:55 -04:00 committed by GitHub
commit 71ec7c57f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
99 changed files with 263 additions and 287 deletions

View file

@ -47,7 +47,7 @@ function showPlaybackInfo(btn, session) {
text.push(globalize.translate('MediaIsBeingConverted'));
text.push(DashboardPage.getSessionNowPlayingStreamInfo(session));
if (session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length) {
if (session.TranscodingInfo?.TranscodeReasons?.length) {
text.push('<br/>');
text.push(globalize.translate('LabelReasonForTranscoding'));
session.TranscodingInfo.TranscodeReasons.forEach(function (transcodeReason) {
@ -90,7 +90,7 @@ function showOptionsMenu(btn, session) {
});
}
if (session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length) {
if (session.TranscodingInfo?.TranscodeReasons?.length) {
menuItems.push({
name: globalize.translate('ViewPlaybackInfo'),
id: 'transcodinginfo'
@ -402,7 +402,7 @@ window.DashboardPage = {
} else if (displayPlayMethod === 'DirectStream') {
html += globalize.translate('DirectStreaming');
} else if (displayPlayMethod === 'Transcode') {
if (session.TranscodingInfo && session.TranscodingInfo.Framerate) {
if (session.TranscodingInfo?.Framerate) {
html += `${globalize.translate('Framerate')}: ${session.TranscodingInfo.Framerate}fps`;
}
@ -481,7 +481,7 @@ window.DashboardPage = {
let topText = escapeHtml(itemHelper.getDisplayName(nowPlayingItem));
let bottomText = '';
if (nowPlayingItem.Artists && nowPlayingItem.Artists.length) {
if (nowPlayingItem.Artists?.length) {
bottomText = topText;
topText = escapeHtml(nowPlayingItem.Artists[0]);
} else {
@ -493,7 +493,7 @@ window.DashboardPage = {
}
}
if (nowPlayingItem.ImageTags && nowPlayingItem.ImageTags.Logo) {
if (nowPlayingItem.ImageTags?.Logo) {
imgUrl = ApiClient.getScaledImageUrl(nowPlayingItem.Id, {
tag: nowPlayingItem.ImageTags.Logo,
maxHeight: 24,
@ -571,7 +571,7 @@ window.DashboardPage = {
const btnSessionPlayPauseIcon = btnSessionPlayPause.querySelector('.material-icons');
btnSessionPlayPauseIcon.classList.remove('play_arrow', 'pause');
btnSessionPlayPauseIcon.classList.add(session.PlayState && session.PlayState.IsPaused ? 'play_arrow' : 'pause');
btnSessionPlayPauseIcon.classList.add(session.PlayState?.IsPaused ? 'play_arrow' : 'pause');
row.querySelector('.sessionNowPlayingTime').innerText = DashboardPage.getSessionNowPlayingTime(session);
row.querySelector('.sessionUserName').innerHTML = DashboardPage.getUsersHtml(session);
@ -620,7 +620,7 @@ window.DashboardPage = {
getNowPlayingImageUrl: function (item) {
/* Screen width is multiplied by 0.2, as the there is currently no way to get the width of
elements that aren't created yet. */
if (item && item.BackdropImageTags && item.BackdropImageTags.length) {
if (item?.BackdropImageTags?.length) {
return ApiClient.getScaledImageUrl(item.Id, {
maxWidth: Math.round(dom.getScreenWidth() * 0.20),
type: 'Backdrop',
@ -628,7 +628,7 @@ window.DashboardPage = {
});
}
if (item && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
if (item?.ParentBackdropImageTags?.length) {
return ApiClient.getScaledImageUrl(item.ParentBackdropItemId, {
maxWidth: Math.round(dom.getScreenWidth() * 0.20),
type: 'Backdrop',
@ -636,7 +636,7 @@ window.DashboardPage = {
});
}
if (item && item.BackdropImageTag) {
if (item?.BackdropImageTag) {
return ApiClient.getScaledImageUrl(item.BackdropItemId, {
maxWidth: Math.round(dom.getScreenWidth() * 0.20),
type: 'Backdrop',
@ -644,7 +644,7 @@ window.DashboardPage = {
});
}
const imageTags = (item || {}).ImageTags || {};
const imageTags = item?.ImageTags || {};
if (item && imageTags.Thumb) {
return ApiClient.getScaledImageUrl(item.Id, {
@ -654,7 +654,7 @@ window.DashboardPage = {
});
}
if (item && item.ParentThumbImageTag) {
if (item?.ParentThumbImageTag) {
return ApiClient.getScaledImageUrl(item.ParentThumbItemId, {
maxWidth: Math.round(dom.getScreenWidth() * 0.20),
type: 'Thumb',
@ -662,7 +662,7 @@ window.DashboardPage = {
});
}
if (item && item.ThumbImageTag) {
if (item?.ThumbImageTag) {
return ApiClient.getScaledImageUrl(item.ThumbItemId, {
maxWidth: Math.round(dom.getScreenWidth() * 0.20),
type: 'Thumb',
@ -678,7 +678,7 @@ window.DashboardPage = {
});
}
if (item && item.PrimaryImageTag) {
if (item?.PrimaryImageTag) {
return ApiClient.getScaledImageUrl(item.PrimaryImageItemId, {
maxWidth: Math.round(dom.getScreenWidth() * 0.20),
type: 'Primary',
@ -686,7 +686,7 @@ window.DashboardPage = {
});
}
if (item && item.AlbumPrimaryImageTag) {
if (item?.AlbumPrimaryImageTag) {
return ApiClient.getScaledImageUrl(item.AlbumId, {
maxWidth: Math.round(dom.getScreenWidth() * 0.20),
type: 'Primary',

View file

@ -415,7 +415,7 @@ function renderContainerProfiles(page, profiles) {
html += '<a is="emby-linkbutton" href="#" class="lnkEditSubProfile" data-profileindex="' + i + '">';
html += '<p>' + globalize.translate('ValueContainer', profile.Container || allText) + '</p>';
if (profile.Conditions && profile.Conditions.length) {
if (profile.Conditions?.length) {
html += '<p>';
html += globalize.translate('ValueConditions', profile.Conditions.map(function (c) {
return c.Property;
@ -487,7 +487,7 @@ function renderCodecProfiles(page, profiles) {
html += '<a is="emby-linkbutton" href="#" class="lnkEditSubProfile" data-profileindex="' + i + '">';
html += '<p>' + globalize.translate('ValueCodec', profile.Codec || allText) + '</p>';
if (profile.Conditions && profile.Conditions.length) {
if (profile.Conditions?.length) {
html += '<p>';
html += globalize.translate('ValueConditions', profile.Conditions.map(function (c) {
return c.Property;
@ -567,7 +567,7 @@ function renderResponseProfiles(page, profiles) {
}
}
if (profile.Conditions && profile.Conditions.length) {
if (profile.Conditions?.length) {
html += '<p>';
html += globalize.translate('ValueConditions', profile.Conditions.map(function (c) {
return c.Property;

View file

@ -13,8 +13,8 @@ import confirm from '../../components/confirm/confirm';
import cardBuilder from '../../components/cardbuilder/cardBuilder';
function addVirtualFolder(page) {
import('../../components/mediaLibraryCreator/mediaLibraryCreator').then(({ default: medialibrarycreator }) => {
new medialibrarycreator({
import('../../components/mediaLibraryCreator/mediaLibraryCreator').then(({ default: MediaLibraryCreator }) => {
new MediaLibraryCreator({
collectionTypeOptions: getCollectionTypeOptions().filter(function (f) {
return !f.hidden;
}),
@ -28,8 +28,8 @@ function addVirtualFolder(page) {
}
function editVirtualFolder(page, virtualFolder) {
import('../../components/mediaLibraryEditor/mediaLibraryEditor').then(({ default: medialibraryeditor }) => {
new medialibraryeditor({
import('../../components/mediaLibraryEditor/mediaLibraryEditor').then(({ default: MediaLibraryEditor }) => {
new MediaLibraryEditor({
refresh: shouldRefreshLibraryAfterChanges(page),
library: virtualFolder
}).then(function (hasChanges) {
@ -62,8 +62,8 @@ function deleteVirtualFolder(page, virtualFolder) {
}
function refreshVirtualFolder(page, virtualFolder) {
import('../../components/refreshdialog/refreshdialog').then(({ default: refreshDialog }) => {
new refreshDialog({
import('../../components/refreshdialog/refreshdialog').then(({ default: RefreshDialog }) => {
new RefreshDialog({
itemIds: [virtualFolder.ItemId],
serverId: ApiClient.serverId(),
mode: 'scan'

View file

@ -24,12 +24,6 @@ function fillTimeOfDay(select) {
}).join('');
}
Array.prototype.remove = function (from, to) {
const rest = this.slice((to || from) + 1 || this.length);
this.length = from < 0 ? this.length + from : from;
return this.push.apply(this, rest);
};
const ScheduledTaskPage = {
refreshScheduledTask: function (view) {
loading.show();
@ -143,7 +137,7 @@ const ScheduledTaskPage = {
loading.show();
const id = getParameterByName('id');
ApiClient.getScheduledTask(id).then(function (task) {
task.Triggers.remove(index);
task.Triggers.splice(index, 1);
ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).then(function () {
ScheduledTaskPage.refreshScheduledTask(view);
});

View file

@ -49,11 +49,11 @@ class HomeView extends TabbedView {
}
const instance = this;
return import(/* webpackChunkName: "[request]" */ `../controllers/${depends}`).then(({ default: controllerFactory }) => {
return import(/* webpackChunkName: "[request]" */ `../controllers/${depends}`).then(({ default: ControllerFactory }) => {
let controller = instance.tabControllers[index];
if (!controller) {
controller = new controllerFactory(instance.view.querySelector(".tabContent[data-index='" + index + "']"), instance.params);
controller = new ControllerFactory(instance.view.querySelector(".tabContent[data-index='" + index + "']"), instance.params);
instance.tabControllers[index] = controller;
}

View file

@ -406,7 +406,7 @@ function renderName(item, container, context) {
if (item.AlbumArtists) {
parentNameHtml.push(getArtistLinksHtml(item.AlbumArtists, item.ServerId, context));
parentNameLast = true;
} else if (item.ArtistItems && item.ArtistItems.length && item.Type === 'MusicVideo') {
} else if (item.ArtistItems?.length && item.Type === 'MusicVideo') {
parentNameHtml.push(getArtistLinksHtml(item.ArtistItems, item.ServerId, context));
parentNameLast = true;
} else if (item.SeriesName && item.Type === 'Episode') {
@ -475,7 +475,7 @@ function renderName(item, container, context) {
}
function setTrailerButtonVisibility(page, item) {
if ((item.LocalTrailerCount || item.RemoteTrailers && item.RemoteTrailers.length) && playbackManager.getSupportedCommands().indexOf('PlayTrailers') !== -1) {
if ((item.LocalTrailerCount || item.RemoteTrailers?.length) && playbackManager.getSupportedCommands().indexOf('PlayTrailers') !== -1) {
hideAll(page, 'btnPlayTrailer', true);
} else {
hideAll(page, 'btnPlayTrailer');
@ -505,7 +505,7 @@ function renderDetailPageBackdrop(page, item, apiClient) {
let hasbackdrop = false;
const itemBackdropElement = page.querySelector('#itemBackdrop');
if (item.BackdropImageTags && item.BackdropImageTags.length) {
if (item.BackdropImageTags?.length) {
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: 'Backdrop',
maxWidth: dom.getScreenWidth(),
@ -523,7 +523,7 @@ function renderDetailPageBackdrop(page, item, apiClient) {
});
imageLoader.lazyImage(itemBackdropElement, imgUrl);
hasbackdrop = true;
} else if (item.ImageTags && item.ImageTags.Primary) {
} else if (item.ImageTags?.Primary) {
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: 'Primary',
maxWidth: dom.getScreenWidth(),
@ -660,7 +660,7 @@ function logoImageUrl(item, apiClient, options) {
options = options || {};
options.type = 'Logo';
if (item.ImageTags && item.ImageTags.Logo) {
if (item.ImageTags?.Logo) {
options.tag = item.ImageTags.Logo;
return apiClient.getScaledImageUrl(item.Id, options);
}
@ -691,8 +691,8 @@ function showRecordingFields(instance, page, item, user) {
const recordingFieldsElement = page.querySelector('.recordingFields');
if (item.Type == 'Program' && user.Policy.EnableLiveTvManagement) {
import('../../components/recordingcreator/recordingfields').then(({ default: recordingFields }) => {
instance.currentRecordingFields = new recordingFields({
import('../../components/recordingcreator/recordingfields').then(({ default: RecordingFields }) => {
instance.currentRecordingFields = new RecordingFields({
parent: recordingFieldsElement,
programId: item.Id,
serverId: item.ServerId
@ -1054,7 +1054,7 @@ function renderMiscInfo(page, item) {
function renderTagline(page, item) {
const taglineElement = page.querySelector('.tagline');
if (item.Taglines && item.Taglines.length) {
if (item.Taglines?.length) {
taglineElement.classList.remove('hide');
taglineElement.innerHTML = '<bdi>' + escapeHtml(item.Taglines[0]) + '</bdi>';
} else {
@ -1263,7 +1263,7 @@ function renderSeriesAirTime(page, item) {
return;
}
let html = '';
if (item.AirDays && item.AirDays.length) {
if (item.AirDays?.length) {
if (item.AirDays.length == 7) {
html += 'daily';
} else {
@ -1826,7 +1826,7 @@ function renderCast(page, item) {
});
}
function itemDetailPage() {
function ItemDetailPage() {
const self = this;
self.setInitialCollapsibleState = setInitialCollapsibleState;
self.renderDetails = renderDetails;
@ -1846,7 +1846,7 @@ function onTrackSelectionsSubmit(e) {
return false;
}
window.ItemDetailPage = new itemDetailPage();
window.ItemDetailPage = new ItemDetailPage();
export default function (view, params) {
function getApiClient() {

View file

@ -399,8 +399,8 @@ function showSortMenu() {
function onNewItemClick() {
const instance = this;
import('../components/playlisteditor/playlisteditor').then(({ default: playlistEditor }) => {
new playlistEditor({
import('../components/playlisteditor/playlisteditor').then(({ default: PlaylistEditor }) => {
new PlaylistEditor({
items: [],
serverId: instance.params.serverId
});

View file

@ -1,4 +1,4 @@
import tvguide from '../../components/guide/guide';
import Guide from '../../components/guide/guide';
export default function (view, params, tabContent) {
let guideInstance;
@ -6,7 +6,7 @@ export default function (view, params, tabContent) {
self.renderTab = function () {
if (!guideInstance) {
guideInstance = new tvguide({
guideInstance = new Guide({
element: tabContent,
serverId: ApiClient.serverId()
});

View file

@ -229,7 +229,7 @@ export default function (view, params) {
function onTabChange(evt) {
const previousTabController = tabControllers[parseInt(evt.detail.previousIndex, 10)];
if (previousTabController && previousTabController.onHide) {
if (previousTabController?.onHide) {
previousTabController.onHide();
}
@ -274,7 +274,7 @@ export default function (view, params) {
break;
}
import(`../livetv/${depends}`).then(({ default: controllerFactory }) => {
import(`../livetv/${depends}`).then(({ default: ControllerFactory }) => {
let tabContent;
if (index === 0) {
@ -290,7 +290,7 @@ export default function (view, params) {
if (index === 0) {
controller = self;
} else {
controller = new controllerFactory(view, params, tabContent);
controller = new ControllerFactory(view, params, tabContent);
}
tabControllers[index] = controller;
@ -388,7 +388,7 @@ export default function (view, params) {
inputManager.on(window, onInputCommand);
});
view.addEventListener('viewbeforehide', function () {
if (currentTabController && currentTabController.onHide) {
if (currentTabController?.onHide) {
currentTabController.onHide();
}

View file

@ -9,8 +9,8 @@ function onListingsSubmitted() {
}
function init(page, type, providerId) {
import(`../components/tvproviders/${type}`).then(({ default: factory }) => {
const instance = new factory(page, providerId, {});
import(`../components/tvproviders/${type}`).then(({ default: ProviderFactory }) => {
const instance = new ProviderFactory(page, providerId, {});
Events.on(instance, 'submitted', onListingsSubmitted);
instance.init();
});

View file

@ -165,8 +165,8 @@ function showProviderOptions(page, providerId, button) {
}
function mapChannels(page, providerId) {
import('../components/channelMapper/channelMapper').then(({ default: channelMapper }) => {
new channelMapper({
import('../components/channelMapper/channelMapper').then(({ default: ChannelMapper }) => {
new ChannelMapper({
serverId: ApiClient.serverInfo().Id,
providerId: providerId
}).show();

View file

@ -106,8 +106,8 @@ function submitForm(page) {
}
function getDetectedDevice() {
return import('../components/tunerPicker').then(({ default: tunerPicker }) => {
return new tunerPicker().show({
return import('../components/tunerPicker').then(({ default: TunerPicker }) => {
return new TunerPicker().show({
serverId: ApiClient.serverId()
});
});

View file

@ -289,8 +289,8 @@ export default function (view, params, tabContent, options) {
query = userSettings.loadQuerySettings(savedQueryKey, query);
this.showFilterMenu = function () {
import('../../components/filterdialog/filterdialog').then(({ default: filterDialogFactory }) => {
const filterDialog = new filterDialogFactory({
import('../../components/filterdialog/filterdialog').then(({ default: FilterDialog }) => {
const filterDialog = new FilterDialog({
query: query,
mode: 'movies',
serverId: ApiClient.serverId()

View file

@ -314,7 +314,7 @@ export default function (view, params) {
break;
}
import(`../movies/${depends}`).then(({ default: controllerFactory }) => {
import(`../movies/${depends}`).then(({ default: ControllerFactory }) => {
let tabContent;
if (index === suggestionsTabIndex) {
@ -330,11 +330,11 @@ export default function (view, params) {
if (index === suggestionsTabIndex) {
controller = this;
} else if (index == 0 || index == 3) {
controller = new controllerFactory(view, params, tabContent, {
controller = new ControllerFactory(view, params, tabContent, {
mode: index ? 'favorites' : 'movies'
});
} else {
controller = new controllerFactory(view, params, tabContent);
controller = new ControllerFactory(view, params, tabContent);
}
tabControllers[index] = controller;

View file

@ -182,8 +182,8 @@ export default function (view, params, tabContent) {
let isLoading = false;
this.showFilterMenu = function () {
import('../../components/filterdialog/filterdialog').then(({ default: filterDialogFactory }) => {
const filterDialog = new filterDialogFactory({
import('../../components/filterdialog/filterdialog').then(({ default: FilterDialog }) => {
const filterDialog = new FilterDialog({
query: getQuery(),
mode: 'movies',
serverId: ApiClient.serverId()

View file

@ -189,8 +189,8 @@ export default function (view, params, tabContent) {
let isLoading = false;
this.showFilterMenu = function () {
import('../../components/filterdialog/filterdialog').then(({ default: filterDialogFactory }) => {
const filterDialog = new filterDialogFactory({
import('../../components/filterdialog/filterdialog').then(({ default: FilterDialog }) => {
const filterDialog = new FilterDialog({
query: getQuery(),
mode: 'albums',
serverId: ApiClient.serverId()

View file

@ -170,8 +170,8 @@ export default function (view, params, tabContent) {
let isLoading = false;
this.showFilterMenu = function () {
import('../../components/filterdialog/filterdialog').then(({ default: filterDialogFactory }) => {
const filterDialog = new filterDialogFactory({
import('../../components/filterdialog/filterdialog').then(({ default: FilterDialog }) => {
const filterDialog = new FilterDialog({
query: getQuery(tabContent),
mode: this.mode,
serverId: ApiClient.serverId()

View file

@ -290,7 +290,7 @@ export default function (view, params) {
break;
}
import(`../music/${depends}`).then(({ default: controllerFactory }) => {
import(`../music/${depends}`).then(({ default: ControllerFactory }) => {
let tabContent;
if (index == 1) {
@ -306,7 +306,7 @@ export default function (view, params) {
if (index === 1) {
controller = this;
} else {
controller = new controllerFactory(view, params, tabContent);
controller = new ControllerFactory(view, params, tabContent);
}
if (index == 2) {

View file

@ -135,8 +135,8 @@ export default function (view, params, tabContent) {
let isLoading = false;
self.showFilterMenu = function () {
import('../../components/filterdialog/filterdialog').then(({ default: filterDialogFactory }) => {
const filterDialog = new filterDialogFactory({
import('../../components/filterdialog/filterdialog').then(({ default: FilterDialog }) => {
const filterDialog = new FilterDialog({
query: getQuery(tabContent),
mode: 'songs',
serverId: ApiClient.serverId()

View file

@ -1,9 +1,9 @@
import remotecontrolFactory from '../../../components/remotecontrol/remotecontrol';
import RemoteControl from '../../../components/remotecontrol/remotecontrol';
import libraryMenu from '../../../scripts/libraryMenu';
import '../../../elements/emby-button/emby-button';
export default function (view) {
const remoteControl = new remotecontrolFactory();
const remoteControl = new RemoteControl();
remoteControl.init(view, view.querySelector('.remoteControlContent'));
view.addEventListener('viewshow', function () {
libraryMenu.setTransparentMenu(true);

View file

@ -666,7 +666,7 @@ export default function (view) {
if (item.Type === 'TvChannel') {
const program = item.CurrentProgram;
if (program && program.EndDate) {
if (program?.EndDate) {
try {
const endDate = datetime.parseISO8601Date(program.EndDate);
@ -1685,7 +1685,7 @@ export default function (view) {
ticks *= value;
const item = currentItem;
if (item && item.Chapters && item.Chapters.length && item.Chapters[0].ImageTag) {
if (item?.Chapters?.length && item.Chapters[0].ImageTag) {
const html = getChapterBubbleHtml(ServerConnections.getApiClient(item.ServerId), item, item.Chapters, ticks);
if (html) {

View file

@ -171,8 +171,8 @@ export default function (view, params, tabContent) {
let isLoading = false;
self.showFilterMenu = function () {
import('../../components/filterdialog/filterdialog').then(({ default: filterDialogFactory }) => {
const filterDialog = new filterDialogFactory({
import('../../components/filterdialog/filterdialog').then(({ default: FilterDialog }) => {
const filterDialog = new FilterDialog({
query: getQuery(tabContent),
mode: 'episodes',
serverId: ApiClient.serverId()

View file

@ -268,7 +268,7 @@ export default function (view, params) {
break;
}
import(`../shows/${depends}`).then(({ default: controllerFactory }) => {
import(`../shows/${depends}`).then(({ default: ControllerFactory }) => {
let tabContent;
if (index === 1) {
@ -284,7 +284,7 @@ export default function (view, params) {
if (index === 1) {
controller = self;
} else {
controller = new controllerFactory(view, params, tabContent);
controller = new ControllerFactory(view, params, tabContent);
}
tabControllers[index] = controller;

View file

@ -199,8 +199,8 @@ export default function (view, params, tabContent) {
let isLoading = false;
this.showFilterMenu = function () {
import('../../components/filterdialog/filterdialog').then(({ default: filterDialogFactory }) => {
const filterDialog = new filterDialogFactory({
import('../../components/filterdialog/filterdialog').then(({ default: FilterDialog }) => {
const filterDialog = new FilterDialog({
query: getQuery(tabContent),
mode: 'series',
serverId: ApiClient.serverId()