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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
src/components/appFooter/appFooter.js
View file

@ -9,7 +9,7 @@ function render() {
return elem;
}
class appFooter {
class AppFooter {
constructor() {
const self = this;
@ -33,4 +33,4 @@ class appFooter {
}
}
export default new appFooter();
export default new AppFooter();

4
src/components/backdrop/backdrop.js
View file

@ -37,7 +37,7 @@ class Backdrop {
parent.appendChild(backdropImage);
if (!enableAnimation()) {
if (existingBackdropImage && existingBackdropImage.parentNode) {
if (existingBackdropImage?.parentNode) {
existingBackdropImage.parentNode.removeChild(existingBackdropImage);
}
internalBackdrop(true);
@ -51,7 +51,7 @@ class Backdrop {
if (backdropImage === self.currentAnimatingElement) {
self.currentAnimatingElement = null;
}
if (existingBackdropImage && existingBackdropImage.parentNode) {
if (existingBackdropImage?.parentNode) {
existingBackdropImage.parentNode.removeChild(existingBackdropImage);
}
};

12
src/components/cardbuilder/cardBuilder.js
View file

@ -546,7 +546,7 @@ function getCardImageUrl(item, apiClient, options, shape) {
imgType = 'Backdrop';
imgTag = item.ParentBackdropImageTags[0];
itemId = item.ParentBackdropItemId;
} else if (item.ImageTags && item.ImageTags.Primary && (item.Type !== 'Episode' || item.ChildCount !== 0)) {
} else if (item.ImageTags?.Primary && (item.Type !== 'Episode' || item.ChildCount !== 0)) {
imgType = 'Primary';
imgTag = item.ImageTags.Primary;
height = width && primaryImageAspectRatio ? Math.round(width / primaryImageAspectRatio) : null;
@ -591,10 +591,10 @@ function getCardImageUrl(item, apiClient, options, shape) {
} else if (item.Type === 'Season' && item.ImageTags && item.ImageTags.Thumb) {
imgType = 'Thumb';
imgTag = item.ImageTags.Thumb;
} else if (item.BackdropImageTags && item.BackdropImageTags.length) {
} else if (item.BackdropImageTags?.length) {
imgType = 'Backdrop';
imgTag = item.BackdropImageTags[0];
} else if (item.ImageTags && item.ImageTags.Thumb) {
} else if (item.ImageTags?.Thumb) {
imgType = 'Thumb';
imgTag = item.ImageTags.Thumb;
} else if (item.SeriesThumbImageTag && options.inheritThumb !== false) {
@ -605,7 +605,7 @@ function getCardImageUrl(item, apiClient, options, shape) {
imgType = 'Thumb';
imgTag = item.ParentThumbImageTag;
itemId = item.ParentThumbItemId;
} else if (item.ParentBackdropImageTags && item.ParentBackdropImageTags.length && options.inheritThumb !== false) {
} else if (item.ParentBackdropImageTags?.length && options.inheritThumb !== false) {
imgType = 'Backdrop';
imgTag = item.ParentBackdropImageTags[0];
itemId = item.ParentBackdropItemId;
@ -634,7 +634,7 @@ function getCardImageUrl(item, apiClient, options, shape) {
return {
imgUrl: imgUrl,
blurhash: (blurHashes[imgType] || {})[imgTag],
blurhash: blurHashes[imgType]?.[imgTag],
forceName: forceName,
coverImage: coverImage
};
@ -1422,7 +1422,7 @@ function buildCard(index, item, apiClient, options) {
className += ' card-withuserdata';
}
const positionTicksData = item.UserData && item.UserData.PlaybackPositionTicks ? (' data-positionticks="' + item.UserData.PlaybackPositionTicks + '"') : '';
const positionTicksData = item.UserData?.PlaybackPositionTicks ? (' data-positionticks="' + item.UserData.PlaybackPositionTicks + '"') : '';
const collectionIdData = options.collectionId ? (' data-collectionid="' + options.collectionId + '"') : '';
const playlistIdData = options.playlistId ? (' data-playlistid="' + options.playlistId + '"') : '';
const mediaTypeData = item.MediaType ? (' data-mediatype="' + item.MediaType + '"') : '';

2
src/components/cardbuilder/chaptercardbuilder.js
View file

@ -26,7 +26,7 @@ function buildChapterCardsHtml(item, chapters, options) {
}
}
const mediaStreams = ((item.MediaSources || [])[0] || {}).MediaStreams || [];
const mediaStreams = (item.MediaSources || [])[0]?.MediaStreams || [];
const videoStream = mediaStreams.filter(({ Type }) => {
return Type === 'Video';
})[0] || {};

2
src/components/channelMapper/channelMapper.js
View file

@ -12,7 +12,7 @@ import 'material-design-icons-iconfont';
import '../formdialog.scss';
import ServerConnections from '../ServerConnections';
export default class channelMapper {
export default class ChannelMapper {
constructor(options) {
function mapChannel(button, channelId, providerChannelId) {
loading.show();

4
src/components/guide/guide.js
View file

@ -675,12 +675,12 @@ function Guide(options) {
});
const activeElement = document.activeElement;
const itemId = activeElement && activeElement.getAttribute ? activeElement.getAttribute('data-id') : null;
const itemId = activeElement?.getAttribute ? activeElement.getAttribute('data-id') : null;
let channelRowId = null;
if (activeElement) {
channelRowId = dom.parentWithClass(activeElement, 'channelPrograms');
channelRowId = channelRowId && channelRowId.getAttribute ? channelRowId.getAttribute('data-channelid') : null;
channelRowId = channelRowId?.getAttribute ? channelRowId.getAttribute('data-channelid') : null;
}
renderChannelHeaders(context, channels, apiClient);

2
src/components/homesections/homesections.js
View file

@ -76,7 +76,7 @@ export function loadSections(elem, apiClient, user, userSettings) {
});
} else {
let noLibDescription;
if (user['Policy'] && user['Policy']['IsAdministrator']) {
if (user.Policy?.IsAdministrator) {
noLibDescription = globalize.translate('NoCreatedLibraries', '<br><a id="button-createLibrary" class="button-link">', '</a>');
} else {
noLibDescription = globalize.translate('AskAdminToCreateLibrary');

2
src/components/htmlMediaHelper.js
View file

@ -68,7 +68,7 @@ export function handleHlsJsMediaError(instance, reject) {
let now = Date.now();
if (window.performance && window.performance.now) {
if (window.performance?.now) {
now = performance.now(); // eslint-disable-line compat/compat
}

2
src/components/imageUploader/imageUploader.js
View file

@ -41,7 +41,7 @@ function onFileReaderError(evt) {
function setFiles(page, files) {
const file = files[0];
if (!file || !file.type.match('image.*')) {
if (!file?.type.match('image.*')) {
page.querySelector('#imageOutput').innerHTML = '';
page.querySelector('#fldUpload').classList.add('hide');
currentFile = null;

2
src/components/images/imageLoader.js
View file

@ -9,7 +9,7 @@ worker.addEventListener(
'message',
({ data: { pixels, hsh, width, height } }) => {
const elems = targetDic[hsh];
if (elems && elems.length) {
if (elems?.length) {
for (const elem of elems) {
drawBlurhash(elem, pixels, width, height);
}

8
src/components/indicators/indicators.js
View file

@ -12,7 +12,7 @@ export function enableProgressIndicator(item) {
export function getProgressHtml(pct, options) {
let containerClass = 'itemProgressBar';
if (options && options.containerClass) {
if (options?.containerClass) {
containerClass += ' ' + options.containerClass;
}
@ -21,7 +21,7 @@ export function getProgressHtml(pct, options) {
function getAutoTimeProgressHtml(pct, options, isRecording, start, end) {
let containerClass = 'itemProgressBar';
if (options && options.containerClass) {
if (options?.containerClass) {
containerClass += ' ' + options.containerClass;
}
@ -36,7 +36,7 @@ function getAutoTimeProgressHtml(pct, options, isRecording, start, end) {
export function getProgressBarHtml(item, options) {
let pct;
if (enableProgressIndicator(item) && item.Type !== 'Recording') {
const userData = options && options.userData ? options.userData : item.UserData;
const userData = options?.userData ? options.userData : item.UserData;
if (userData) {
pct = userData.PlayedPercentage;
@ -90,7 +90,7 @@ export function getPlayedIndicatorHtml(item) {
}
export function getChildCountIndicatorHtml(item, options) {
const minCount = options && options.minCount ? options.minCount : 0;
const minCount = options?.minCount ? options.minCount : 0;
if (item.ChildCount && item.ChildCount > minCount) {
return '<div class="countIndicator indicator">' + datetime.toLocaleString(item.ChildCount) + '</div>';

8
src/components/itemContextMenu.js
View file

@ -345,8 +345,8 @@ function executeCommand(item, id, options) {
});
break;
case 'addtoplaylist':
import('./playlisteditor/playlisteditor').then(({ default: playlistEditor }) => {
new playlistEditor({
import('./playlisteditor/playlisteditor').then(({ default: PlaylistEditor }) => {
new PlaylistEditor({
items: [itemId],
serverId: serverId
}).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
@ -630,8 +630,8 @@ function deleteItem(apiClient, item) {
}
function refresh(apiClient, item) {
import('./refreshdialog/refreshdialog').then(({ default: refreshDialog }) => {
new refreshDialog({
import('./refreshdialog/refreshdialog').then(({ default: RefreshDialog }) => {
new RefreshDialog({
itemIds: [item.Id],
serverId: apiClient.serverInfo().Id,
mode: item.Type === 'CollectionFolder' ? 'scan' : null

2
src/components/itemHelper.js
View file

@ -117,7 +117,7 @@ export function canEdit(user, item) {
}
export function isLocalItem(item) {
return item && item.Id && typeof item.Id === 'string' && item.Id.indexOf('local') === 0;
return item?.Id && typeof item.Id === 'string' && item.Id.indexOf('local') === 0;
}
export function canIdentify (user, item) {

2
src/components/itemMediaInfo/itemMediaInfo.js
View file

@ -61,7 +61,7 @@ function getMediaSourceHtml(user, item, version) {
if (version.Container) {
html += `${createAttribute(globalize.translate('MediaInfoContainer'), version.Container)}<br/>`;
}
if (version.Formats && version.Formats.length) {
if (version.Formats?.length) {
html += `${createAttribute(globalize.translate('MediaInfoFormat'), version.Formats.join(','))}<br/>`;
}
if (version.Path && user && user.Policy.IsAdministrator) {

2
src/components/itemidentifier/itemidentifier.js
View file

@ -79,7 +79,7 @@ function searchForIdentificationResults(page) {
SearchInfo: lookupInfo
};
if (currentItem && currentItem.Id) {
if (currentItem?.Id) {
lookupInfo.ItemId = currentItem.Id;
} else {
lookupInfo.IncludeDisabledProviders = true;

2
src/components/itemsrefresher.js
View file

@ -134,7 +134,7 @@ class ItemsRefresher {
}
}
if (this.needsRefresh || (options && options.refresh)) {
if (this.needsRefresh || (options?.refresh)) {
return this.refreshItems();
}

2
src/components/libraryoptionseditor/libraryoptionseditor.js
View file

@ -495,7 +495,7 @@ function setImageFetchersIntoOptions(parent, options) {
}
function setImageOptionsIntoOptions(options) {
const originalTypeOptions = (currentLibraryOptions || {}).TypeOptions || [];
const originalTypeOptions = currentLibraryOptions?.TypeOptions || [];
for (const originalTypeOption of originalTypeOptions) {
let typeOptions = getTypeOptions(options, originalTypeOption.Type);

4
src/components/listview/listview.js
View file

@ -86,7 +86,7 @@ function getImageUrl(item, size) {
type: 'Primary'
};
if (item.ImageTags && item.ImageTags.Primary) {
if (item.ImageTags?.Primary) {
options.tag = item.ImageTags.Primary;
itemId = item.Id;
} else if (item.AlbumId && item.AlbumPrimaryImageTag) {
@ -235,7 +235,7 @@ export function getListViewHtml(options) {
const playlistItemId = item.PlaylistItemId ? (` data-playlistitemid="${item.PlaylistItemId}"`) : '';
const positionTicksData = item.UserData && item.UserData.PlaybackPositionTicks ? (` data-positionticks="${item.UserData.PlaybackPositionTicks}"`) : '';
const positionTicksData = item.UserData?.PlaybackPositionTicks ? (` data-positionticks="${item.UserData.PlaybackPositionTicks}"`) : '';
const collectionIdData = options.collectionId ? (` data-collectionid="${options.collectionId}"`) : '';
const playlistIdData = options.playlistId ? (` data-playlistid="${options.playlistId}"`) : '';
const mediaTypeData = item.MediaType ? (` data-mediatype="${item.MediaType}"`) : '';

4
src/components/mediaLibraryCreator/mediaLibraryCreator.js
View file

@ -188,7 +188,7 @@ function initLibraryOptions(dlg) {
});
}
export class showEditor {
export class MediaLibraryCreator {
constructor(options) {
return new Promise((resolve) => {
currentOptions = options;
@ -224,4 +224,4 @@ let currentOptions;
let hasChanges = false;
let isCreating = false;
export default showEditor;
export default MediaLibraryCreator;

8
src/components/mediaLibraryEditor/mediaLibraryEditor.js
View file

@ -93,7 +93,7 @@ function onListItemClick(e) {
if (listItem) {
const index = parseInt(listItem.getAttribute('data-index'), 10);
const pathInfos = (currentOptions.library.LibraryOptions || {}).PathInfos || [];
const pathInfos = currentOptions.library.LibraryOptions?.PathInfos || [];
const pathInfo = index == null ? {} : pathInfos[index] || {};
const originalPath = pathInfo.Path || (index == null ? null : currentOptions.library.Locations[index]);
const btnRemovePath = dom.parentWithClass(e.target, 'btnRemovePath');
@ -139,7 +139,7 @@ function refreshLibraryFromServer(page) {
}
function renderLibrary(page, options) {
let pathInfos = (options.library.LibraryOptions || {}).PathInfos || [];
let pathInfos = options.library.LibraryOptions?.PathInfos || [];
if (!pathInfos.length) {
pathInfos = options.library.Locations.map(p => {
@ -197,7 +197,7 @@ function onDialogClosed() {
currentDeferred.resolveWith(null, [hasChanges]);
}
export class showEditor {
export class MediaLibraryEditor {
constructor(options) {
const deferred = jQuery.Deferred();
currentOptions = options;
@ -231,4 +231,4 @@ let currentOptions;
let hasChanges = false;
let isCreating = false;
export default showEditor;
export default MediaLibraryEditor;

4
src/components/metadataEditor/metadataEditor.js
View file

@ -759,7 +759,7 @@ function fillItemInfo(context, item, parentalRatingOptions) {
context.querySelector('#txtName').value = item.Name || '';
context.querySelector('#txtOriginalName').value = item.OriginalTitle || '';
context.querySelector('#txtOverview').value = item.Overview || '';
context.querySelector('#txtTagline').value = (item.Taglines && item.Taglines.length ? item.Taglines[0] : '');
context.querySelector('#txtTagline').value = (item.Taglines?.length ? item.Taglines[0] : '');
context.querySelector('#txtSortName').value = item.ForcedSortName || '';
context.querySelector('#txtCommunityRating').value = item.CommunityRating || '';
@ -826,7 +826,7 @@ function fillItemInfo(context, item, parentalRatingOptions) {
context.querySelector('#txtAirTime').value = item.AirTime || '';
const placeofBirth = item.ProductionLocations && item.ProductionLocations.length ? item.ProductionLocations[0] : '';
const placeofBirth = item.ProductionLocations?.length ? item.ProductionLocations[0] : '';
context.querySelector('#txtPlaceOfBirth').value = placeofBirth;
context.querySelector('#txtOriginalAspectRatio').value = item.AspectRatio || '';

8
src/components/multiSelect/multiSelect.js
View file

@ -6,7 +6,7 @@ import dom from '../../scripts/dom';
import './multiSelect.scss';
import ServerConnections from '../ServerConnections';
import alert from '../alert';
import playlistEditor from '../playlisteditor/playlisteditor';
import PlaylistEditor from '../playlisteditor/playlisteditor';
import confirm from '../confirm/confirm';
import itemHelper from '../itemHelper';
import datetime from '../../scripts/datetime';
@ -269,7 +269,7 @@ function showMenuForSelectedItems(e) {
dispatchNeedsRefresh();
break;
case 'playlist':
new playlistEditor({
new PlaylistEditor({
items: items,
serverId: serverId
});
@ -299,8 +299,8 @@ function showMenuForSelectedItems(e) {
dispatchNeedsRefresh();
break;
case 'refresh':
import('../refreshdialog/refreshdialog').then(({ default: refreshDialog }) => {
new refreshDialog({
import('../refreshdialog/refreshdialog').then(({ default: RefreshDialog }) => {
new RefreshDialog({
itemIds: items,
serverId: serverId
}).show();

4
src/components/nowPlayingBar/nowPlayingBar.js
View file

@ -233,7 +233,7 @@ function bindEvents(elem) {
positionSlider.getBubbleText = function (value) {
const state = lastPlayerState;
if (!state || !state.NowPlayingItem || !currentRuntimeTicks) {
if (!state?.NowPlayingItem || !currentRuntimeTicks) {
return '--:--';
}
@ -476,7 +476,7 @@ function imageUrl(item, options) {
options = options || {};
options.type = options.type || 'Primary';
if (item.ImageTags && item.ImageTags[options.type]) {
if (item.ImageTags?.[options.type]) {
options.tag = item.ImageTags[options.type];
return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options);
}

2
src/components/playback/mediasession.js
View file

@ -35,7 +35,7 @@ function seriesImageUrl(item, options = {}) {
function imageUrl(item, options = {}) {
options.type = options.type || 'Primary';
if (item.ImageTags && item.ImageTags[options.type]) {
if (item.ImageTags?.[options.type]) {
options.tag = item.ImageTags[options.type];
return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.Id, options);

4
src/components/playback/nowplayinghelper.js
View file

@ -23,7 +23,7 @@ export function getNowPlayingNames(nowPlayingItem, includeNonNameInfo) {
let bottomText = '';
if (nowPlayingItem.ArtistItems && nowPlayingItem.ArtistItems.length) {
if (nowPlayingItem.ArtistItems?.length) {
bottomItem = {
Id: nowPlayingItem.ArtistItems[0].Id,
Name: nowPlayingItem.ArtistItems[0].Name,
@ -34,7 +34,7 @@ export function getNowPlayingNames(nowPlayingItem, includeNonNameInfo) {
bottomText = nowPlayingItem.ArtistItems.map(function (a) {
return a.Name;
}).join(', ');
} else if (nowPlayingItem.Artists && nowPlayingItem.Artists.length) {
} else if (nowPlayingItem.Artists?.length) {
bottomText = nowPlayingItem.Artists.join(', ');
} else if (nowPlayingItem.SeriesName || nowPlayingItem.Album) {
bottomText = topText;

54
src/components/playback/playbackmanager.js
View file

@ -163,12 +163,12 @@ function backdropImageUrl(apiClient, item, options) {
options.quality = 100;
}
if (item.BackdropImageTags && item.BackdropImageTags.length) {
if (item.BackdropImageTags?.length) {
options.tag = item.BackdropImageTags[0];
return apiClient.getScaledImageUrl(item.Id, options);
}
if (item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
if (item.ParentBackdropImageTags?.length) {
options.tag = item.ParentBackdropImageTags[0];
return apiClient.getScaledImageUrl(item.ParentBackdropItemId, options);
}
@ -773,7 +773,7 @@ class PlaybackManager {
self.setActivePlayer = function (player, targetInfo) {
if (player === 'localplayer' || player.name === 'localplayer') {
if (self._currentPlayer && self._currentPlayer.isLocalPlayer) {
if (self._currentPlayer?.isLocalPlayer) {
return;
}
setCurrentPlayerInternal(null, null);
@ -795,7 +795,7 @@ class PlaybackManager {
self.trySetActivePlayer = function (player, targetInfo) {
if (player === 'localplayer' || player.name === 'localplayer') {
if (self._currentPlayer && self._currentPlayer.isLocalPlayer) {
if (self._currentPlayer?.isLocalPlayer) {
return;
}
return;
@ -967,7 +967,7 @@ class PlaybackManager {
return player.isPlaying();
}
return player != null && player.currentSrc() != null;
return player?.currentSrc() != null;
};
self.isPlayingMediaType = function (mediaType, player) {
@ -989,7 +989,7 @@ class PlaybackManager {
self.isPlayingLocally = function (mediaTypes, player) {
player = player || self._currentPlayer;
if (!player || !player.isLocalPlayer) {
if (!player?.isLocalPlayer) {
return false;
}
@ -1068,7 +1068,7 @@ class PlaybackManager {
self.setAspectRatio = function (val, player) {
player = player || self._currentPlayer;
if (player && player.setAspectRatio) {
if (player?.setAspectRatio) {
player.setAspectRatio(val);
}
};
@ -1076,7 +1076,7 @@ class PlaybackManager {
self.getSupportedAspectRatios = function (player) {
player = player || self._currentPlayer;
if (player && player.getSupportedAspectRatios) {
if (player?.getSupportedAspectRatios) {
return player.getSupportedAspectRatios();
}
@ -1086,7 +1086,7 @@ class PlaybackManager {
self.getAspectRatio = function (player) {
player = player || self._currentPlayer;
if (player && player.getAspectRatio) {
if (player?.getAspectRatio) {
return player.getAspectRatio();
}
};
@ -1131,7 +1131,7 @@ class PlaybackManager {
self.getSupportedPlaybackRates = function (player) {
player = player || self._currentPlayer;
if (player && player.getSupportedPlaybackRates) {
if (player?.getSupportedPlaybackRates) {
return player.getSupportedPlaybackRates();
}
return [];
@ -1351,7 +1351,7 @@ class PlaybackManager {
self.getMaxStreamingBitrate = function (player) {
player = player || self._currentPlayer;
if (player && player.getMaxStreamingBitrate) {
if (player?.getMaxStreamingBitrate) {
return player.getMaxStreamingBitrate();
}
@ -1370,7 +1370,7 @@ class PlaybackManager {
self.enableAutomaticBitrateDetection = function (player) {
player = player || self._currentPlayer;
if (player && player.enableAutomaticBitrateDetection) {
if (player?.enableAutomaticBitrateDetection) {
return player.enableAutomaticBitrateDetection();
}
@ -1386,7 +1386,7 @@ class PlaybackManager {
self.setMaxStreamingBitrate = function (options, player) {
player = player || self._currentPlayer;
if (player && player.setMaxStreamingBitrate) {
if (player?.setMaxStreamingBitrate) {
return player.setMaxStreamingBitrate(options);
}
@ -1443,7 +1443,7 @@ class PlaybackManager {
document.webkitCancelFullscreen();
} else {
const elem = document.querySelector('video');
if (elem && elem.webkitEnterFullscreen) {
if (elem?.webkitEnterFullscreen) {
elem.webkitEnterFullscreen();
}
}
@ -2078,7 +2078,7 @@ class PlaybackManager {
const mediaSource = self.currentMediaSource(player);
if (mediaSource && mediaSource.RunTimeTicks) {
if (mediaSource?.RunTimeTicks) {
return mediaSource.RunTimeTicks;
}
@ -2614,7 +2614,7 @@ class PlaybackManager {
if (mediaSource.MediaStreams && player.useFullSubtitleUrls) {
mediaSource.MediaStreams.forEach(stream => {
if (stream.DeliveryUrl && stream.DeliveryUrl.startsWith('/')) {
if (stream.DeliveryUrl?.startsWith('/')) {
stream.DeliveryUrl = apiClient.getUrl(stream.DeliveryUrl);
}
});
@ -3444,7 +3444,7 @@ class PlaybackManager {
const streamInfo = getPlayerData(player).streamInfo;
if (streamInfo && streamInfo.started && !streamInfo.ended) {
if (streamInfo?.started && !streamInfo.ended) {
reportPlayback(self, state, player, reportPlaylist, serverId, 'reportPlaybackProgress', progressEventName);
}
@ -3515,7 +3515,7 @@ class PlaybackManager {
const nextItem = this._playQueueManager.getNextItemInfo();
if (!nextItem || !nextItem.item) {
if (!nextItem?.item) {
return Promise.reject();
}
@ -3656,7 +3656,7 @@ class PlaybackManager {
async playTrailers(item) {
const player = this._currentPlayer;
if (player && player.playTrailers) {
if (player?.playTrailers) {
return player.playTrailers(item);
}
@ -3668,7 +3668,7 @@ class PlaybackManager {
items = await apiClient.getLocalTrailers(apiClient.getCurrentUserId(), item.Id);
}
if (!items || !items.length) {
if (!items?.length) {
items = (item.RemoteTrailers || []).map((t) => {
return {
Name: t.Name || (item.Name + ' Trailer'),
@ -3750,7 +3750,7 @@ class PlaybackManager {
}
setPlaybackRate(value, player = this._currentPlayer) {
if (player && player.setPlaybackRate) {
if (player?.setPlaybackRate) {
player.setPlaybackRate(value);
// Save the new playback rate in the browser session, to restore when playing a new video.
@ -3759,7 +3759,7 @@ class PlaybackManager {
}
getPlaybackRate(player = this._currentPlayer) {
if (player && player.getPlaybackRate) {
if (player?.getPlaybackRate) {
return player.getPlaybackRate();
}
@ -3767,7 +3767,7 @@ class PlaybackManager {
}
instantMix(item, player = this._currentPlayer) {
if (player && player.instantMix) {
if (player?.instantMix) {
return player.instantMix(item);
}
@ -3788,7 +3788,7 @@ class PlaybackManager {
}
shuffle(shuffleItem, player = this._currentPlayer) {
if (player && player.shuffle) {
if (player?.shuffle) {
return player.shuffle(shuffleItem);
}
@ -3805,7 +3805,7 @@ class PlaybackManager {
const mediaSource = this.currentMediaSource(player);
const mediaStreams = (mediaSource || {}).MediaStreams || [];
const mediaStreams = mediaSource?.MediaStreams || [];
return mediaStreams.filter(function (s) {
return s.Type === 'Audio';
}).sort(itemHelper.sortTracks);
@ -3821,7 +3821,7 @@ class PlaybackManager {
const mediaSource = this.currentMediaSource(player);
const mediaStreams = (mediaSource || {}).MediaStreams || [];
const mediaStreams = mediaSource?.MediaStreams || [];
return mediaStreams.filter(function (s) {
return s.Type === 'Subtitle';
}).sort(itemHelper.sortTracks);
@ -3960,7 +3960,7 @@ class PlaybackManager {
}
displayContent(options, player = this._currentPlayer) {
if (player && player.displayContent) {
if (player?.displayContent) {
player.displayContent(options);
}
}

5
src/components/playback/playbackorientation.js
View file

@ -1,4 +1,3 @@
import { playbackManager } from './playbackmanager';
import layoutManager from '../layoutManager';
import Events from '../../utils/events.ts';
@ -19,7 +18,7 @@ Events.on(playbackManager, 'playbackstart', function (e, player) {
if (isLocalVideo && layoutManager.mobile) {
/* eslint-disable-next-line compat/compat */
const lockOrientation = window.screen.lockOrientation || window.screen.mozLockOrientation || window.screen.msLockOrientation || (window.screen.orientation && window.screen.orientation.lock);
const lockOrientation = window.screen.lockOrientation || window.screen.mozLockOrientation || window.screen.msLockOrientation || (window.screen.orientation?.lock);
if (lockOrientation) {
try {
@ -40,7 +39,7 @@ Events.on(playbackManager, 'playbackstart', function (e, player) {
Events.on(playbackManager, 'playbackstop', function (e, playbackStopInfo) {
if (orientationLocked && !playbackStopInfo.nextMediaType) {
/* eslint-disable-next-line compat/compat */
const unlockOrientation = window.screen.unlockOrientation || window.screen.mozUnlockOrientation || window.screen.msUnlockOrientation || (window.screen.orientation && window.screen.orientation.unlock);
const unlockOrientation = window.screen.unlockOrientation || window.screen.mozUnlockOrientation || window.screen.msUnlockOrientation || (window.screen.orientation?.unlock);
if (unlockOrientation) {
try {

2
src/components/playback/playersettingsmenu.js
View file

@ -248,7 +248,7 @@ export function show(options) {
const player = options.player;
const currentItem = playbackManager.currentItem(player);
if (!currentItem || !currentItem.ServerId) {
if (!currentItem?.ServerId) {
return showWithUser(options, player, null);
}

4
src/components/playback/playmethodhelper.js
View file

@ -3,9 +3,9 @@ export function getDisplayPlayMethod(session) {
return null;
}
if (session.TranscodingInfo && session.TranscodingInfo.IsVideoDirect && session.TranscodingInfo.IsAudioDirect) {
if (session.TranscodingInfo?.IsVideoDirect && session.TranscodingInfo.IsAudioDirect) {
return 'Remux';
} else if (session.TranscodingInfo && session.TranscodingInfo.IsVideoDirect) {
} else if (session.TranscodingInfo?.IsVideoDirect) {
return 'DirectStream';
} else if (session.PlayState.PlayMethod === 'Transcode') {
return 'Transcode';

2
src/components/playerstats/playerstats.js
View file

@ -166,7 +166,7 @@ function getTranscodingStats(session, player, displayPlayMethod) {
value: session.TranscodingInfo.Framerate + ' fps'
});
}
if (session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length) {
if (session.TranscodingInfo.TranscodeReasons?.length) {
sessionStats.push({
label: globalize.translate('LabelReasonForTranscoding'),
value: session.TranscodingInfo.TranscodeReasons.map(translateReason).join('<br/>')

4
src/components/playlisteditor/playlisteditor.js
View file

@ -221,7 +221,7 @@ function centerFocus(elem, horiz, on) {
});
}
export class showEditor {
export class PlaylistEditor {
constructor(options) {
const items = options.items || {};
currentServerId = options.serverId;
@ -280,4 +280,4 @@ export class showEditor {
}
}
export default showEditor;
export default PlaylistEditor;

6
src/components/pluginManager.js
View file

@ -72,13 +72,13 @@ class PluginManager {
throw new TypeError('Plugin definitions in window have to be an (async) function returning the plugin class');
}
const pluginClass = await pluginDefinition();
if (typeof pluginClass !== 'function') {
const PluginClass = await pluginDefinition();
if (typeof PluginClass !== 'function') {
throw new TypeError(`Plugin definition doesn't return a class for '${pluginSpec}'`);
}
// init plugin and pass basic dependencies
plugin = new pluginClass({
plugin = new PluginClass({
events: Events,
loading,
appSettings,

6
src/components/recordingcreator/recordingcreator.js
View file

@ -6,7 +6,7 @@ import loading from '../loading/loading';
import scrollHelper from '../../scripts/scrollHelper';
import datetime from '../../scripts/datetime';
import imageLoader from '../images/imageLoader';
import recordingFields from './recordingfields';
import RecordingFields from './recordingfields';
import Events from '../../utils/events.ts';
import '../../elements/emby-button/emby-button';
import '../../elements/emby-button/paper-icon-button-light';
@ -170,7 +170,7 @@ function showEditor(itemId, serverId) {
Events.off(currentRecordingFields, 'recordingchanged', onRecordingChanged);
executeCloseAction(closeAction, itemId, serverId);
if (currentRecordingFields && currentRecordingFields.hasChanged()) {
if (currentRecordingFields?.hasChanged()) {
resolve();
} else {
reject();
@ -185,7 +185,7 @@ function showEditor(itemId, serverId) {
reload(dlg, itemId, serverId);
currentRecordingFields = new recordingFields({
currentRecordingFields = new RecordingFields({
parent: dlg.querySelector('.recordingFields'),
programId: itemId,
serverId: serverId

8
src/components/remotecontrol/remotecontrol.js
View file

@ -119,7 +119,7 @@ function imageUrl(item, options) {
options = options || {};
options.type = options.type || 'Primary';
if (item.ImageTags && item.ImageTags[options.type]) {
if (item.ImageTags?.[options.type]) {
options.tag = item.ImageTags[options.type];
return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options);
}
@ -691,10 +691,10 @@ export default function () {
}
function savePlaylist() {
import('../playlisteditor/playlisteditor').then(({ default: playlistEditor }) => {
import('../playlisteditor/playlisteditor').then(({ default: PlaylistEditor }) => {
getSaveablePlaylistItems().then(function (items) {
const serverId = items.length ? items[0].ServerId : ApiClient.serverId();
new playlistEditor({
new PlaylistEditor({
items: items.map(function (i) {
return i.Id;
}),
@ -800,7 +800,7 @@ export default function () {
positionSlider.getBubbleText = function (value) {
const state = lastPlayerState;
if (!state || !state.NowPlayingItem || !currentRuntimeTicks) {
if (!state?.NowPlayingItem || !currentRuntimeTicks) {
return '--:--';
}

6
src/components/router/appRouter.js
View file

@ -321,7 +321,7 @@ class AppRouter {
path: ctx.path
};
}).catch((result) => {
if (!result || !result.cancelled) {
if (!result?.cancelled) {
onNewViewNeeded();
}
});
@ -403,7 +403,7 @@ class AppRouter {
const isCurrentRouteStartup = this.currentRouteInfo ? this.currentRouteInfo.route.startup : true;
const shouldExitApp = ctx.isBack && route.isDefaultRoute && isCurrentRouteStartup;
if (!shouldExitApp && (!apiClient || !apiClient.isLoggedIn()) && !route.anonymous) {
if (!shouldExitApp && (!apiClient?.isLoggedIn()) && !route.anonymous) {
console.debug('[appRouter] route does not allow anonymous access: redirecting to login');
this.#beginConnectionWizard();
return;
@ -417,7 +417,7 @@ class AppRouter {
return;
}
if (apiClient && apiClient.isLoggedIn()) {
if (apiClient?.isLoggedIn()) {
console.debug('[appRouter] user is authenticated');
if (route.roles) {

6
src/components/shortcuts.js
View file

@ -33,7 +33,7 @@ function playAllFromHere(card, serverId, queue) {
}
const itemsContainer = dom.parentWithClass(card, 'itemsContainer');
if (itemsContainer && itemsContainer.fetchData) {
if (itemsContainer?.fetchData) {
const queryOptions = queue ? { StartIndex: startIndex } : {};
return itemsContainer.fetchData(queryOptions).then(result => {
@ -270,8 +270,8 @@ function executeAction(card, target, action) {
}
function addToPlaylist(item) {
import('./playlisteditor/playlisteditor').then(({ default: playlistEditor }) => {
new playlistEditor().show({
import('./playlisteditor/playlisteditor').then(({ default: PlaylistEditor }) => {
new PlaylistEditor().show({
items: [item.Id],
serverId: item.ServerId

6
src/components/slideshow/slideshow.js
View file

@ -41,7 +41,7 @@ function getImageUrl(item, options, apiClient) {
return apiClient.getScaledImageUrl(item, options);
}
if (item.ImageTags && item.ImageTags[options.type]) {
if (item.ImageTags?.[options.type]) {
options.tag = item.ImageTags[options.type];
return apiClient.getScaledImageUrl(item.Id, options);
}
@ -70,7 +70,7 @@ function getBackdropImageUrl(item, options, apiClient) {
options.quality = 100;
}
if (item.BackdropImageTags && item.BackdropImageTags.length) {
if (item.BackdropImageTags?.length) {
options.tag = item.BackdropImageTags[0];
return apiClient.getScaledImageUrl(item.Id, options);
}
@ -87,7 +87,7 @@ function getImgUrl(item, user) {
const apiClient = ServerConnections.getApiClient(item.ServerId);
const imageOptions = {};
if (item.BackdropImageTags && item.BackdropImageTags.length) {
if (item.BackdropImageTags?.length) {
return getBackdropImageUrl(item, imageOptions, apiClient);
} else {
if (item.MediaType === 'Photo' && user && user.Policy.EnableContentDownloading) {

6
src/components/tabbedview/tabbedview.js
View file

@ -65,7 +65,7 @@ class TabbedView {
const previousIndex = e.detail.previousIndex;
const previousTabController = previousIndex == null ? null : self.tabControllers[previousIndex];
if (previousTabController && previousTabController.onPause) {
if (previousTabController?.onPause) {
previousTabController.onPause();
}
@ -93,7 +93,7 @@ class TabbedView {
if (!currentTabController) {
mainTabsManager.selectedTabIndex(this.initialTabIndex);
} else if (currentTabController && currentTabController.onResume) {
} else if (currentTabController?.onResume) {
currentTabController.onResume({});
}
}
@ -101,7 +101,7 @@ class TabbedView {
onPause() {
const currentTabController = this.currentTabController;
if (currentTabController && currentTabController.onPause) {
if (currentTabController?.onPause) {
currentTabController.onPause();
}
}

2
src/components/themeMediaPlayer.js
View file

@ -86,7 +86,7 @@ document.addEventListener('viewshow', function (e) {
const state = e.detail.state || {};
const item = state.item;
if (item && item.ServerId) {
if (item?.ServerId) {
loadThemeMedia(item);
return;
}

4
src/components/tunerPicker.js
View file

@ -120,7 +120,7 @@ function discoverDevices(view) {
});
}
function tunerPicker() {
function TunerPicker() {
this.show = function () {
const dialogOptions = {
removeOnClose: true,
@ -182,4 +182,4 @@ function tunerPicker() {
let currentDevices = [];
export default tunerPicker;
export default TunerPicker;

2
src/components/viewManager/ViewManagerPage.tsx
View file

@ -47,7 +47,7 @@ const ViewManagerPage: FunctionComponent<ViewManagerPageProps> = ({
viewManager.tryRestoreView(viewOptions)
.catch(async (result?: RestoreViewFailResponse) => {
if (!result || !result.cancelled) {
if (!result?.cancelled) {
const [ controllerFactory, viewHtml ] = await Promise.all([
import(/* webpackChunkName: "[request]" */ `../../controllers/${controller}`),
import(/* webpackChunkName: "[request]" */ `../../controllers/${view}`)

1
src/components/viewManager/viewManager.js
View file

@ -21,6 +21,7 @@ viewContainer.setOnBeforeChange(function (newView, isRestored, options) {
newView.initComplete = true;
if (typeof options.controllerFactory === 'function') {
// eslint-disable-next-line new-cap
new options.controllerFactory(newView, eventDetail.detail.params);
} else if (options.controllerFactory && typeof options.controllerFactory.default === 'function') {
new options.controllerFactory.default(newView, eventDetail.detail.params);