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 branch 'master' into migrate-to-ES6-47

Browse source
This commit is contained in:
Cameron 2020-07-31 21:27:48 +01:00 • committed by GitHub
commit ee14ae76db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
107 changed files with 1532 additions and 2239 deletions
Download patch file Download diff file Expand all files Collapse all files

226
src/controllers/list.js
View file

@ -11,7 +11,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
Limit: 300
};
if ('Recordings' === params.type) {
if (params.type === 'Recordings') {
query.IsInProgress = false;
} else {
query.HasAired = false;
@ -21,39 +21,39 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
query.GenreIds = params.genreId;
}
if ('true' === params.IsMovie) {
if (params.IsMovie === 'true') {
query.IsMovie = true;
} else if ('false' === params.IsMovie) {
} else if (params.IsMovie === 'false') {
query.IsMovie = false;
}
if ('true' === params.IsSeries) {
if (params.IsSeries === 'true') {
query.IsSeries = true;
} else if ('false' === params.IsSeries) {
} else if (params.IsSeries === 'false') {
query.IsSeries = false;
}
if ('true' === params.IsNews) {
if (params.IsNews === 'true') {
query.IsNews = true;
} else if ('false' === params.IsNews) {
} else if (params.IsNews === 'false') {
query.IsNews = false;
}
if ('true' === params.IsSports) {
if (params.IsSports === 'true') {
query.IsSports = true;
} else if ('false' === params.IsSports) {
} else if (params.IsSports === 'false') {
query.IsSports = false;
}
if ('true' === params.IsKids) {
if (params.IsKids === 'true') {
query.IsKids = true;
} else if ('false' === params.IsKids) {
} else if (params.IsKids === 'false') {
query.IsKids = false;
}
if ('true' === params.IsAiring) {
if (params.IsAiring === 'true') {
query.IsAiring = true;
} else if ('false' === params.IsAiring) {
} else if (params.IsAiring === 'false') {
query.IsAiring = false;
}
@ -183,13 +183,13 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
var btnSortIcon = instance.btnSortIcon;
if (btnSortIcon) {
setSortButtonIcon(btnSortIcon, 'Descending' === values.sortOrder ? 'arrow_downward' : 'arrow_upward');
setSortButtonIcon(btnSortIcon, values.sortOrder === 'Descending' ? 'arrow_downward' : 'arrow_upward');
}
}
}
function updateItemsContainerForViewType(instance) {
if ('list' === instance.getViewSettings().imageType) {
if (instance.getViewSettings().imageType === 'list') {
instance.itemsContainer.classList.remove('vertical-wrap');
instance.itemsContainer.classList.add('vertical-list');
} else {
@ -205,11 +205,11 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
if (alphaPicker) {
var values = instance.getSortValues();
if (null == numItems) {
if (numItems == null) {
numItems = 100;
}
if ('SortName' === values.sortBy && 'Ascending' === values.sortOrder && numItems > 40) {
if (values.sortBy === 'SortName' && values.sortOrder === 'Ascending' && numItems > 40) {
alphaPicker.classList.remove('hide');
instance.itemsContainer.parentNode.classList.add('padded-right-withalphapicker');
} else {
@ -224,19 +224,19 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
var apiClient = connectionManager.getApiClient(params.serverId);
instance.queryRecursive = false;
if ('Recordings' === params.type) {
if (params.type === 'Recordings') {
return apiClient.getLiveTvRecordings(getInitialLiveTvQuery(instance, params));
}
if ('Programs' === params.type) {
if ('true' === params.IsAiring) {
if (params.type === 'Programs') {
if (params.IsAiring === 'true') {
return apiClient.getLiveTvRecommendedPrograms(getInitialLiveTvQuery(instance, params));
}
return apiClient.getLiveTvPrograms(getInitialLiveTvQuery(instance, params));
}
if ('nextup' === params.type) {
if (params.type === 'nextup') {
return apiClient.getNextUpEpisodes(modifyQueryWithFilters(instance, {
Limit: limit,
Fields: 'PrimaryImageAspectRatio,SeriesInfo,DateCreated,BasicSyncInfo',
@ -252,9 +252,9 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
instance.queryRecursive = true;
var method = 'getItems';
if ('MusicArtist' === params.type) {
if (params.type === 'MusicArtist') {
method = 'getArtists';
} else if ('Person' === params.type) {
} else if (params.type === 'Person') {
method = 'getPeople';
}
@ -263,15 +263,15 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
Limit: limit,
Fields: 'PrimaryImageAspectRatio,SortName',
ImageTypeLimit: 1,
IncludeItemTypes: 'MusicArtist' === params.type || 'Person' === params.type ? null : params.type,
IncludeItemTypes: params.type === 'MusicArtist' || params.type === 'Person' ? null : params.type,
Recursive: true,
IsFavorite: 'true' === params.IsFavorite || null,
IsFavorite: params.IsFavorite === 'true' || null,
ArtistIds: params.artistId || null,
SortBy: sortBy
}));
}
if ('Genre' === item.Type || 'MusicGenre' === item.Type || 'Studio' === item.Type || 'Person' === item.Type) {
if (item.Type === 'Genre' || item.Type === 'MusicGenre' || item.Type === 'Studio' || item.Type === 'Person') {
instance.queryRecursive = true;
var query = {
StartIndex: startIndex,
@ -282,25 +282,25 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
SortBy: sortBy
};
if ('Studio' === item.Type) {
if (item.Type === 'Studio') {
query.StudioIds = item.Id;
} else if ('Genre' === item.Type || 'MusicGenre' === item.Type) {
} else if (item.Type === 'Genre' || item.Type === 'MusicGenre') {
query.GenreIds = item.Id;
} else if ('Person' === item.Type) {
} else if (item.Type === 'Person') {
query.PersonIds = item.Id;
}
if ('MusicGenre' === item.Type) {
if (item.Type === 'MusicGenre') {
query.IncludeItemTypes = 'MusicAlbum';
} else if ('GameGenre' === item.Type) {
} else if (item.Type === 'GameGenre') {
query.IncludeItemTypes = 'Game';
} else if ('movies' === item.CollectionType) {
} else if (item.CollectionType === 'movies') {
query.IncludeItemTypes = 'Movie';
} else if ('tvshows' === item.CollectionType) {
} else if (item.CollectionType === 'tvshows') {
query.IncludeItemTypes = 'Series';
} else if ('Genre' === item.Type) {
} else if (item.Type === 'Genre') {
query.IncludeItemTypes = 'Movie,Series,Video';
} else if ('Person' === item.Type) {
} else if (item.Type === 'Person') {
query.IncludeItemTypes = params.type;
}
@ -318,7 +318,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
}
function getItem(params) {
if ('Recordings' === params.type || 'Programs' === params.type || 'nextup' === params.type) {
if (params.type === 'Recordings' || params.type === 'Programs' || params.type === 'nextup') {
return Promise.resolve(null);
}
@ -414,7 +414,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
function ItemsView(view, params) {
function fetchData() {
return getItems(self, params, self.currentItem).then(function (result) {
if (null == self.totalItemCount) {
if (self.totalItemCount == null) {
self.totalItemCount = result.Items ? result.Items.length : result.length;
}
@ -426,7 +426,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
function getItemsHtml(items) {
var settings = self.getViewSettings();
if ('list' === settings.imageType) {
if (settings.imageType === 'list') {
return listView.getListViewHtml({
items: items
});
@ -440,24 +440,24 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
var item = self.currentItem;
var lines = settings.showTitle ? 2 : 0;
if ('banner' === settings.imageType) {
if (settings.imageType === 'banner') {
shape = 'banner';
} else if ('disc' === settings.imageType) {
} else if (settings.imageType === 'disc') {
shape = 'square';
preferDisc = true;
} else if ('logo' === settings.imageType) {
} else if (settings.imageType === 'logo') {
shape = 'backdrop';
preferLogo = true;
} else if ('thumb' === settings.imageType) {
} else if (settings.imageType === 'thumb') {
shape = 'backdrop';
preferThumb = true;
} else if ('nextup' === params.type) {
} else if (params.type === 'nextup') {
shape = 'backdrop';
preferThumb = 'thumb' === settings.imageType;
} else if ('Programs' === params.type || 'Recordings' === params.type) {
shape = 'true' === params.IsMovie ? 'portrait' : 'autoVertical';
preferThumb = 'true' !== params.IsMovie ? 'auto' : false;
defaultShape = 'true' === params.IsMovie ? 'portrait' : 'backdrop';
preferThumb = settings.imageType === 'thumb';
} else if (params.type === 'Programs' || params.type === 'Recordings') {
shape = params.IsMovie === 'true' ? 'portrait' : 'autoVertical';
preferThumb = params.IsMovie !== 'true' ? 'auto' : false;
defaultShape = params.IsMovie === 'true' ? 'portrait' : 'backdrop';
} else {
shape = 'autoVertical';
}
@ -475,46 +475,46 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
overlayMoreButton: true,
overlayText: !settings.showTitle,
defaultShape: defaultShape,
action: 'Audio' === params.type ? 'playallfromhere' : null
action: params.type === 'Audio' ? 'playallfromhere' : null
};
if ('nextup' === params.type) {
if (params.type === 'nextup') {
posterOptions.showParentTitle = settings.showTitle;
} else if ('Person' === params.type) {
} else if (params.type === 'Person') {
posterOptions.showYear = false;
posterOptions.showParentTitle = false;
lines = 1;
} else if ('Audio' === params.type) {
} else if (params.type === 'Audio') {
posterOptions.showParentTitle = settings.showTitle;
} else if ('MusicAlbum' === params.type) {
} else if (params.type === 'MusicAlbum') {
posterOptions.showParentTitle = settings.showTitle;
} else if ('Episode' === params.type) {
} else if (params.type === 'Episode') {
posterOptions.showParentTitle = settings.showTitle;
} else if ('MusicArtist' === params.type) {
} else if (params.type === 'MusicArtist') {
posterOptions.showYear = false;
lines = 1;
} else if ('Programs' === params.type) {
} else if (params.type === 'Programs') {
lines = settings.showTitle ? 1 : 0;
var showParentTitle = settings.showTitle && 'true' !== params.IsMovie;
var showParentTitle = settings.showTitle && params.IsMovie !== 'true';
if (showParentTitle) {
lines++;
}
var showAirTime = settings.showTitle && 'Recordings' !== params.type;
var showAirTime = settings.showTitle && params.type !== 'Recordings';
if (showAirTime) {
lines++;
}
var showYear = settings.showTitle && 'true' === params.IsMovie && 'Recordings' === params.type;
var showYear = settings.showTitle && params.IsMovie === 'true' && params.type === 'Recordings';
if (showYear) {
lines++;
}
posterOptions = Object.assign(posterOptions, {
inheritThumb: 'Recordings' === params.type,
inheritThumb: params.type === 'Recordings',
context: 'livetv',
showParentTitle: showParentTitle,
showAirTime: showAirTime,
@ -531,7 +531,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
posterOptions.lines = lines;
posterOptions.items = items;
if (item && 'folders' === item.CollectionType) {
if (item && item.CollectionType === 'folders') {
posterOptions.context = 'folders';
}
@ -563,7 +563,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
function setTitle(item) {
Emby.Page.setTitle(getTitle(item) || '');
if (item && 'playlists' === item.CollectionType) {
if (item && item.CollectionType === 'playlists') {
hideOrShowAll(view.querySelectorAll('.btnNewItem'), false);
} else {
hideOrShowAll(view.querySelectorAll('.btnNewItem'), true);
@ -571,43 +571,43 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
}
function getTitle(item) {
if ('Recordings' === params.type) {
if (params.type === 'Recordings') {
return globalize.translate('Recordings');
}
if ('Programs' === params.type) {
if ('true' === params.IsMovie) {
if (params.type === 'Programs') {
if (params.IsMovie === 'true') {
return globalize.translate('Movies');
}
if ('true' === params.IsSports) {
if (params.IsSports === 'true') {
return globalize.translate('Sports');
}
if ('true' === params.IsKids) {
if (params.IsKids === 'true') {
return globalize.translate('HeaderForKids');
}
if ('true' === params.IsAiring) {
if (params.IsAiring === 'true') {
return globalize.translate('HeaderOnNow');
}
if ('true' === params.IsSeries) {
if (params.IsSeries === 'true') {
return globalize.translate('Shows');
}
if ('true' === params.IsNews) {
if (params.IsNews === 'true') {
return globalize.translate('News');
}
return globalize.translate('Programs');
}
if ('nextup' === params.type) {
if (params.type === 'nextup') {
return globalize.translate('NextUp');
}
if ('favoritemovies' === params.type) {
if (params.type === 'favoritemovies') {
return globalize.translate('FavoriteMovies');
}
@ -615,35 +615,35 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
return item.Name;
}
if ('Movie' === params.type) {
if (params.type === 'Movie') {
return globalize.translate('Movies');
}
if ('Series' === params.type) {
if (params.type === 'Series') {
return globalize.translate('Shows');
}
if ('Season' === params.type) {
if (params.type === 'Season') {
return globalize.translate('Seasons');
}
if ('Episode' === params.type) {
if (params.type === 'Episode') {
return globalize.translate('Episodes');
}
if ('MusicArtist' === params.type) {
if (params.type === 'MusicArtist') {
return globalize.translate('Artists');
}
if ('MusicAlbum' === params.type) {
if (params.type === 'MusicAlbum') {
return globalize.translate('Albums');
}
if ('Audio' === params.type) {
if (params.type === 'Audio') {
return globalize.translate('Songs');
}
if ('Video' === params.type) {
if (params.type === 'Video') {
return globalize.translate('Videos');
}
@ -702,11 +702,11 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
if (params.parentId) {
this.itemsContainer.setAttribute('data-parentid', params.parentId);
} else if ('nextup' === params.type) {
} else if (params.type === 'nextup') {
this.itemsContainer.setAttribute('data-monitor', 'videoplayback');
} else if ('favoritemovies' === params.type) {
} else if (params.type === 'favoritemovies') {
this.itemsContainer.setAttribute('data-monitor', 'markfavorite');
} else if ('Programs' === params.type) {
} else if (params.type === 'Programs') {
this.itemsContainer.setAttribute('data-refreshinterval', '300000');
}
@ -739,7 +739,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
var sortButton = sortButtons[i];
sortButton.addEventListener('click', showSortMenu.bind(this));
if ('nextup' !== params.type) {
if (params.type !== 'nextup') {
sortButton.classList.remove('hide');
}
}
@ -774,19 +774,19 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
}
});
if (!isRestored && item && 'PhotoAlbum' !== item.Type) {
if (!isRestored && item && item.Type !== 'PhotoAlbum') {
initAlphaPicker();
}
var itemType = item ? item.Type : null;
if ('MusicGenre' === itemType || 'Programs' !== params.type && 'Channel' !== itemType) {
if (itemType === 'MusicGenre' || params.type !== 'Programs' && itemType !== 'Channel') {
hideOrShowAll(view.querySelectorAll('.btnPlay'), false);
} else {
hideOrShowAll(view.querySelectorAll('.btnPlay'), true);
}
if ('MusicGenre' === itemType || 'Programs' !== params.type && 'nextup' !== params.type && 'Channel' !== itemType) {
if (itemType === 'MusicGenre' || params.type !== 'Programs' && params.type !== 'nextup' && itemType !== 'Channel') {
hideOrShowAll(view.querySelectorAll('.btnShuffle'), false);
} else {
hideOrShowAll(view.querySelectorAll('.btnShuffle'), true);
@ -847,14 +847,14 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
ItemsView.prototype.getFilters = function () {
var basekey = this.getSettingsKey();
return {
IsPlayed: 'true' === userSettings.getFilter(basekey + '-filter-IsPlayed'),
IsUnplayed: 'true' === userSettings.getFilter(basekey + '-filter-IsUnplayed'),
IsFavorite: 'true' === userSettings.getFilter(basekey + '-filter-IsFavorite'),
IsResumable: 'true' === userSettings.getFilter(basekey + '-filter-IsResumable'),
Is4K: 'true' === userSettings.getFilter(basekey + '-filter-Is4K'),
IsHD: 'true' === userSettings.getFilter(basekey + '-filter-IsHD'),
IsSD: 'true' === userSettings.getFilter(basekey + '-filter-IsSD'),
Is3D: 'true' === userSettings.getFilter(basekey + '-filter-Is3D'),
IsPlayed: userSettings.getFilter(basekey + '-filter-IsPlayed') === 'true',
IsUnplayed: userSettings.getFilter(basekey + '-filter-IsUnplayed') === 'true',
IsFavorite: userSettings.getFilter(basekey + '-filter-IsFavorite') === 'true',
IsResumable: userSettings.getFilter(basekey + '-filter-IsResumable') === 'true',
Is4K: userSettings.getFilter(basekey + '-filter-Is4K') === 'true',
IsHD: userSettings.getFilter(basekey + '-filter-IsHD') === 'true',
IsSD: userSettings.getFilter(basekey + '-filter-IsSD') === 'true',
Is3D: userSettings.getFilter(basekey + '-filter-Is3D') === 'true',
VideoTypes: userSettings.getFilter(basekey + '-filter-VideoTypes'),
SeriesStatus: userSettings.getFilter(basekey + '-filter-SeriesStatus'),
HasSubtitles: userSettings.getFilter(basekey + '-filter-HasSubtitles'),
@ -870,7 +870,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
var basekey = this.getSettingsKey();
return {
sortBy: userSettings.getFilter(basekey + '-sortby') || this.getDefaultSortBy(),
sortOrder: 'Descending' === userSettings.getFilter(basekey + '-sortorder') ? 'Descending' : 'Ascending'
sortOrder: userSettings.getFilter(basekey + '-sortorder') === 'Descending' ? 'Descending' : 'Ascending'
};
};
@ -889,7 +889,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
var sortBy = [];
var params = this.params;
if ('Programs' === params.type) {
if (params.type === 'Programs') {
sortBy.push({
name: globalize.translate('AirDate'),
value: 'StartDate,SortName'
@ -914,7 +914,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
sortBy.push(option);
}
if ('Programs' !== params.type) {
if (params.type !== 'Programs') {
sortBy.push({
name: globalize.translate('DateAdded'),
value: 'DateCreated,SortName'
@ -957,7 +957,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
};
ItemsView.prototype.getNameSortOption = function (params) {
if ('Episode' === params.type) {
if (params.type === 'Episode') {
return {
name: globalize.translate('Name'),
value: 'SeriesName,SortName'
@ -971,7 +971,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
};
ItemsView.prototype.getPlayCountSortOption = function () {
if ('Programs' === this.params.type) {
if (this.params.type === 'Programs') {
return null;
}
@ -982,7 +982,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
};
ItemsView.prototype.getDatePlayedSortOption = function () {
if ('Programs' === this.params.type) {
if (this.params.type === 'Programs') {
return null;
}
@ -993,7 +993,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
};
ItemsView.prototype.getCriticRatingSortOption = function () {
if ('Programs' === this.params.type) {
if (this.params.type === 'Programs') {
return null;
}
@ -1014,8 +1014,8 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
var filters = [];
var params = this.params;
if (!('nextup' === params.type)) {
if ('Programs' === params.type) {
if (!(params.type === 'nextup')) {
if (params.type === 'Programs') {
filters.push('Genres');
} else {
filters.push('IsUnplayed');
@ -1083,7 +1083,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
var item = (this.params, this.currentItem);
var fields = ['showTitle'];
if (!item || 'PhotoAlbum' !== item.Type && 'ChannelFolderItem' !== item.Type) {
if (!item || item.Type !== 'PhotoAlbum' && item.Type !== 'ChannelFolderItem') {
fields.push('imageType');
}
@ -1097,25 +1097,25 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
var item = this.currentItem;
var showTitle = userSettings.get(basekey + '-showTitle');
if ('true' === showTitle) {
if (showTitle === 'true') {
showTitle = true;
} else if ('false' === showTitle) {
} else if (showTitle === 'false') {
showTitle = false;
} else if ('Programs' === params.type || 'Recordings' === params.type || 'Person' === params.type || 'nextup' === params.type || 'Audio' === params.type || 'MusicAlbum' === params.type || 'MusicArtist' === params.type) {
} else if (params.type === 'Programs' || params.type === 'Recordings' || params.type === 'Person' || params.type === 'nextup' || params.type === 'Audio' || params.type === 'MusicAlbum' || params.type === 'MusicArtist') {
showTitle = true;
} else if (item && 'PhotoAlbum' !== item.Type) {
} else if (item && item.Type !== 'PhotoAlbum') {
showTitle = true;
}
var imageType = userSettings.get(basekey + '-imageType');
if (!imageType && 'nextup' === params.type) {
if (!imageType && params.type === 'nextup') {
imageType = 'thumb';
}
return {
showTitle: showTitle,
showYear: 'false' !== userSettings.get(basekey + '-showYear'),
showYear: userSettings.get(basekey + '-showYear') !== 'false',
imageType: imageType || 'primary',
viewType: userSettings.get(basekey + '-viewType') || 'images'
};
@ -1124,11 +1124,11 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
ItemsView.prototype.getItemTypes = function () {
var params = this.params;
if ('nextup' === params.type) {
if (params.type === 'nextup') {
return ['Episode'];
}
if ('Programs' === params.type) {
if (params.type === 'Programs') {
return ['Program'];
}