';
- const shape = 'MusicAlbum' == type.type ? getSquareShape(false) : getPortraitShape(false);
+ const shape = type.type == 'MusicAlbum' ? getSquareShape(false) : getPortraitShape(false);
html += cardBuilder.getCardsHtml({
items: items,
shape: shape,
showTitle: true,
- showYear: 'Video' === type.mediaType || 'Series' === type.type,
+ showYear: type.mediaType === 'Video' || type.type === 'Series',
centerText: true,
lazy: true,
showDetailsMenu: true,
@@ -1757,7 +1762,7 @@ import 'emby-select';
}
function getVideosHtml(items) {
- const html = cardBuilder.getCardsHtml({
+ return cardBuilder.getCardsHtml({
items: items,
shape: 'autooverflow',
showTitle: true,
@@ -1766,8 +1771,6 @@ import 'emby-select';
centerText: true,
showRuntime: true
});
-
- return html;
}
function renderSpecials(page, item, user) {
@@ -1875,7 +1878,7 @@ import 'emby-select';
function playCurrentItem(button, mode) {
const item = currentItem;
- if ('Program' === item.Type) {
+ if (item.Type === 'Program') {
const apiClient = connectionManager.getApiClient(item.ServerId);
return void apiClient.getLiveTvChannel(item.ChannelId, apiClient.getCurrentUserId()).then(function (channel) {
playbackManager.play({
@@ -1951,7 +1954,7 @@ import 'emby-select';
function onWebSocketMessage(e, data) {
const msg = data;
- if ('UserDataChanged' === msg.MessageType && currentItem && msg.Data.UserId == apiClient.getCurrentUserId()) {
+ if (msg.MessageType === 'UserDataChanged' && currentItem && msg.Data.UserId == apiClient.getCurrentUserId()) {
const key = currentItem.UserData.Key;
const userData = msg.Data.UserDataList.filter(function (u) {
return u.Key == key;
diff --git a/src/controllers/list.js b/src/controllers/list.js
index e550b535f4..01ef35a26a 100644
--- a/src/controllers/list.js
+++ b/src/controllers/list.js
@@ -9,7 +9,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
Limit: 300
};
- if ('Recordings' === params.type) {
+ if (params.type === 'Recordings') {
query.IsInProgress = false;
} else {
query.HasAired = false;
@@ -19,39 +19,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;
}
@@ -181,13 +181,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 {
@@ -203,11 +203,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 {
@@ -222,19 +222,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',
@@ -250,9 +250,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';
}
@@ -261,15 +261,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,
@@ -280,25 +280,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;
}
@@ -316,7 +316,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);
}
@@ -412,7 +412,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;
}
@@ -424,7 +424,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
});
@@ -438,24 +438,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';
}
@@ -473,46 +473,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,
@@ -529,7 +529,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';
}
@@ -561,7 +561,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);
@@ -569,43 +569,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');
}
@@ -613,35 +613,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');
}
@@ -700,11 +700,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');
}
@@ -737,7 +737,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');
}
}
@@ -772,19 +772,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);
@@ -845,14 +845,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'),
@@ -868,7 +868,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'
};
};
@@ -887,7 +887,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'
@@ -912,7 +912,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'
@@ -955,7 +955,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'
@@ -969,7 +969,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
};
ItemsView.prototype.getPlayCountSortOption = function () {
- if ('Programs' === this.params.type) {
+ if (this.params.type === 'Programs') {
return null;
}
@@ -980,7 +980,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
};
ItemsView.prototype.getDatePlayedSortOption = function () {
- if ('Programs' === this.params.type) {
+ if (this.params.type === 'Programs') {
return null;
}
@@ -991,7 +991,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
};
ItemsView.prototype.getCriticRatingSortOption = function () {
- if ('Programs' === this.params.type) {
+ if (this.params.type === 'Programs') {
return null;
}
@@ -1012,8 +1012,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');
@@ -1081,7 +1081,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');
}
@@ -1095,25 +1095,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'
};
@@ -1122,11 +1122,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'];
}
diff --git a/src/controllers/livetv/livetvsuggested.js b/src/controllers/livetv/livetvsuggested.js
index 036eee9fc6..36ba825a34 100644
--- a/src/controllers/livetv/livetvsuggested.js
+++ b/src/controllers/livetv/livetvsuggested.js
@@ -142,9 +142,9 @@ define(['layoutManager', 'userSettings', 'inputManager', 'loading', 'globalize',
coverImage: true,
overlayText: false,
lazy: true,
- overlayPlayButton: 'play' === overlayButton,
- overlayMoreButton: 'more' === overlayButton,
- overlayInfoButton: 'info' === overlayButton,
+ overlayPlayButton: overlayButton === 'play',
+ overlayMoreButton: overlayButton === 'more',
+ overlayInfoButton: overlayButton === 'info',
allowBottomPadding: !enableScrollX(),
showAirTime: true,
showAirDateTime: true
@@ -261,7 +261,7 @@ define(['layoutManager', 'userSettings', 'inputManager', 'loading', 'globalize',
require(depends, function (controllerFactory) {
var tabContent;
- if (0 == index) {
+ if (index == 0) {
tabContent = view.querySelector(".pageTabContent[data-index='" + index + "']");
self.tabContent = tabContent;
}
@@ -271,9 +271,9 @@ define(['layoutManager', 'userSettings', 'inputManager', 'loading', 'globalize',
if (!controller) {
tabContent = view.querySelector(".pageTabContent[data-index='" + index + "']");
- if (0 === index) {
+ if (index === 0) {
controller = self;
- } else if (6 === index) {
+ } else if (index === 6) {
controller = new controllerFactory(view, tabContent, {
collectionType: 'livetv'
});
@@ -305,8 +305,8 @@ define(['layoutManager', 'userSettings', 'inputManager', 'loading', 'globalize',
getTabController(page, index, function (controller) {
initialTabIndex = null;
- if (-1 == renderedTabs.indexOf(index)) {
- if (1 === index) {
+ if (renderedTabs.indexOf(index) == -1) {
+ if (index === 1) {
renderedTabs.push(index);
}
diff --git a/src/controllers/livetvtuner.js b/src/controllers/livetvtuner.js
index 92f705c02f..0e3b2b689e 100644
--- a/src/controllers/livetvtuner.js
+++ b/src/controllers/livetvtuner.js
@@ -1,232 +1,228 @@
-define(['globalize', 'loading', 'libraryMenu', 'dom', 'emby-input', 'emby-button', 'emby-checkbox', 'emby-select'], function (globalize, loading, libraryMenu, dom) {
- 'use strict';
+import globalize from 'globalize';
+import loading from 'loading';
+import dom from 'dom';
+import 'emby-input';
+import 'emby-button';
+import 'emby-checkbox';
+import 'emby-select';
- function isM3uVariant(type) {
- return ['nextpvr'].indexOf(type || '') !== -1;
- }
+function isM3uVariant(type) {
+ return ['nextpvr'].indexOf(type || '') !== -1;
+}
- function fillTypes(view, currentId) {
- return ApiClient.getJSON(ApiClient.getUrl('LiveTv/TunerHosts/Types')).then(function (types) {
- var selectType = view.querySelector('.selectType');
- var html = '';
- html += types.map(function (tuner) {
- return '
';
- }).join('');
- html += '
';
- selectType.innerHTML = html;
- selectType.disabled = null != currentId;
- selectType.value = '';
- onTypeChange.call(selectType);
- });
- }
-
- function reload(view, providerId) {
- view.querySelector('.txtDevicePath').value = '';
- view.querySelector('.chkFavorite').checked = false;
- view.querySelector('.txtDevicePath').value = '';
-
- if (providerId) {
- ApiClient.getNamedConfiguration('livetv').then(function (config) {
- var info = config.TunerHosts.filter(function (i) {
- return i.Id === providerId;
- })[0];
- fillTunerHostInfo(view, info);
- });
- }
- }
-
- function fillTunerHostInfo(view, info) {
- var selectType = view.querySelector('.selectType');
- var type = info.Type || '';
-
- if (info.Source && isM3uVariant(info.Source)) {
- type = info.Source;
- }
-
- selectType.value = type;
+function fillTypes(view, currentId) {
+ return ApiClient.getJSON(ApiClient.getUrl('LiveTv/TunerHosts/Types')).then(function (types) {
+ const selectType = view.querySelector('.selectType');
+ let html = '';
+ html += types.map(function (tuner) {
+ return '
';
+ }).join('');
+ html += '
';
+ selectType.innerHTML = html;
+ selectType.disabled = currentId != null;
+ selectType.value = '';
onTypeChange.call(selectType);
- view.querySelector('.txtDevicePath').value = info.Url || '';
- view.querySelector('.txtFriendlyName').value = info.FriendlyName || '';
- view.querySelector('.txtUserAgent').value = info.UserAgent || '';
- view.querySelector('.fldDeviceId').value = info.DeviceId || '';
- view.querySelector('.chkFavorite').checked = info.ImportFavoritesOnly;
- view.querySelector('.chkTranscode').checked = info.AllowHWTranscoding;
- view.querySelector('.chkStreamLoop').checked = info.EnableStreamLooping;
- view.querySelector('.txtTunerCount').value = info.TunerCount || '0';
- }
+ });
+}
- function submitForm(page) {
- loading.show();
- var info = {
- Type: page.querySelector('.selectType').value,
- Url: page.querySelector('.txtDevicePath').value || null,
- UserAgent: page.querySelector('.txtUserAgent').value || null,
- FriendlyName: page.querySelector('.txtFriendlyName').value || null,
- DeviceId: page.querySelector('.fldDeviceId').value || null,
- TunerCount: page.querySelector('.txtTunerCount').value || 0,
- ImportFavoritesOnly: page.querySelector('.chkFavorite').checked,
- AllowHWTranscoding: page.querySelector('.chkTranscode').checked,
- EnableStreamLooping: page.querySelector('.chkStreamLoop').checked
- };
+function reload(view, providerId) {
+ view.querySelector('.txtDevicePath').value = '';
+ view.querySelector('.chkFavorite').checked = false;
+ view.querySelector('.txtDevicePath').value = '';
- if (isM3uVariant(info.Type)) {
- info.Source = info.Type;
- info.Type = 'm3u';
- }
-
- var id = getParameterByName('id');
-
- if (id) {
- info.Id = id;
- }
-
- ApiClient.ajax({
- type: 'POST',
- url: ApiClient.getUrl('LiveTv/TunerHosts'),
- data: JSON.stringify(info),
- contentType: 'application/json'
- }).then(function (result) {
- Dashboard.processServerConfigurationUpdateResult();
- Dashboard.navigate('livetvstatus.html');
- }, function () {
- loading.hide();
- Dashboard.alert({
- message: globalize.translate('ErrorSavingTvProvider')
- });
+ if (providerId) {
+ ApiClient.getNamedConfiguration('livetv').then(function (config) {
+ const info = config.TunerHosts.filter(function (i) {
+ return i.Id === providerId;
+ })[0];
+ fillTunerHostInfo(view, info);
});
}
+}
- function getRequirePromise(deps) {
- return new Promise(function (resolve, reject) {
- require(deps, resolve);
- });
+function fillTunerHostInfo(view, info) {
+ const selectType = view.querySelector('.selectType');
+ let type = info.Type || '';
+
+ if (info.Source && isM3uVariant(info.Source)) {
+ type = info.Source;
}
- function getDetectedDevice() {
- return getRequirePromise(['tunerPicker']).then(function (tunerPicker) {
- return new tunerPicker().show({
- serverId: ApiClient.serverId()
- });
- });
- }
+ selectType.value = type;
+ onTypeChange.call(selectType);
+ view.querySelector('.txtDevicePath').value = info.Url || '';
+ view.querySelector('.txtFriendlyName').value = info.FriendlyName || '';
+ view.querySelector('.txtUserAgent').value = info.UserAgent || '';
+ view.querySelector('.fldDeviceId').value = info.DeviceId || '';
+ view.querySelector('.chkFavorite').checked = info.ImportFavoritesOnly;
+ view.querySelector('.chkTranscode').checked = info.AllowHWTranscoding;
+ view.querySelector('.chkStreamLoop').checked = info.EnableStreamLooping;
+ view.querySelector('.txtTunerCount').value = info.TunerCount || '0';
+}
- function onTypeChange() {
- var value = this.value;
- var view = dom.parentWithClass(this, 'page');
- var mayIncludeUnsupportedDrmChannels = 'hdhomerun' === value;
- var supportsTranscoding = 'hdhomerun' === value;
- var supportsFavorites = 'hdhomerun' === value;
- var supportsTunerIpAddress = 'hdhomerun' === value;
- var supportsTunerFileOrUrl = 'm3u' === value;
- var supportsStreamLooping = 'm3u' === value;
- var supportsTunerCount = 'm3u' === value;
- var supportsUserAgent = 'm3u' === value;
- var suppportsSubmit = 'other' !== value;
- var supportsSelectablePath = supportsTunerFileOrUrl;
- var txtDevicePath = view.querySelector('.txtDevicePath');
-
- if (supportsTunerIpAddress) {
- txtDevicePath.label(globalize.translate('LabelTunerIpAddress'));
- view.querySelector('.fldPath').classList.remove('hide');
- } else if (supportsTunerFileOrUrl) {
- txtDevicePath.label(globalize.translate('LabelFileOrUrl'));
- view.querySelector('.fldPath').classList.remove('hide');
- } else {
- view.querySelector('.fldPath').classList.add('hide');
- }
-
- if (supportsSelectablePath) {
- view.querySelector('.btnSelectPath').classList.remove('hide');
- view.querySelector('.txtDevicePath').setAttribute('required', 'required');
- } else {
- view.querySelector('.btnSelectPath').classList.add('hide');
- view.querySelector('.txtDevicePath').removeAttribute('required');
- }
-
- if (supportsUserAgent) {
- view.querySelector('.fldUserAgent').classList.remove('hide');
- } else {
- view.querySelector('.fldUserAgent').classList.add('hide');
- }
-
- if (supportsFavorites) {
- view.querySelector('.fldFavorites').classList.remove('hide');
- } else {
- view.querySelector('.fldFavorites').classList.add('hide');
- }
-
- if (supportsTranscoding) {
- view.querySelector('.fldTranscode').classList.remove('hide');
- } else {
- view.querySelector('.fldTranscode').classList.add('hide');
- }
-
- if (supportsStreamLooping) {
- view.querySelector('.fldStreamLoop').classList.remove('hide');
- } else {
- view.querySelector('.fldStreamLoop').classList.add('hide');
- }
-
- if (supportsTunerCount) {
- view.querySelector('.fldTunerCount').classList.remove('hide');
- view.querySelector('.txtTunerCount').setAttribute('required', 'required');
- } else {
- view.querySelector('.fldTunerCount').classList.add('hide');
- view.querySelector('.txtTunerCount').removeAttribute('required');
- }
-
- if (mayIncludeUnsupportedDrmChannels) {
- view.querySelector('.drmMessage').classList.remove('hide');
- } else {
- view.querySelector('.drmMessage').classList.add('hide');
- }
-
- if (suppportsSubmit) {
- view.querySelector('.button-submit').classList.remove('hide');
- } else {
- view.querySelector('.button-submit').classList.add('hide');
- }
- }
-
- return function (view, params) {
- if (!params.id) {
- view.querySelector('.btnDetect').classList.remove('hide');
- }
-
- view.addEventListener('viewshow', function () {
- var currentId = params.id;
- fillTypes(view, currentId).then(function () {
- reload(view, currentId);
- });
- });
- view.querySelector('form').addEventListener('submit', function (e) {
- submitForm(view);
- e.preventDefault();
- e.stopPropagation();
- return false;
- });
- view.querySelector('.selectType').addEventListener('change', onTypeChange);
- view.querySelector('.btnDetect').addEventListener('click', function () {
- getDetectedDevice().then(function (info) {
- fillTunerHostInfo(view, info);
- });
- });
- view.querySelector('.btnSelectPath').addEventListener('click', function () {
- require(['directorybrowser'], function (directoryBrowser) {
- var picker = new directoryBrowser.default();
- picker.show({
- includeFiles: true,
- callback: function (path) {
- if (path) {
- view.querySelector('.txtDevicePath').value = path;
- }
-
- picker.close();
- }
- });
- });
- });
+function submitForm(page) {
+ loading.show();
+ const info = {
+ Type: page.querySelector('.selectType').value,
+ Url: page.querySelector('.txtDevicePath').value || null,
+ UserAgent: page.querySelector('.txtUserAgent').value || null,
+ FriendlyName: page.querySelector('.txtFriendlyName').value || null,
+ DeviceId: page.querySelector('.fldDeviceId').value || null,
+ TunerCount: page.querySelector('.txtTunerCount').value || 0,
+ ImportFavoritesOnly: page.querySelector('.chkFavorite').checked,
+ AllowHWTranscoding: page.querySelector('.chkTranscode').checked,
+ EnableStreamLooping: page.querySelector('.chkStreamLoop').checked
};
-});
+
+ if (isM3uVariant(info.Type)) {
+ info.Source = info.Type;
+ info.Type = 'm3u';
+ }
+
+ if (getParameterByName('id')) {
+ info.Id = getParameterByName('id');
+ }
+
+ ApiClient.ajax({
+ type: 'POST',
+ url: ApiClient.getUrl('LiveTv/TunerHosts'),
+ data: JSON.stringify(info),
+ contentType: 'application/json'
+ }).then(function (result) {
+ Dashboard.processServerConfigurationUpdateResult();
+ Dashboard.navigate('livetvstatus.html');
+ }, function () {
+ loading.hide();
+ Dashboard.alert({
+ message: globalize.translate('ErrorSavingTvProvider')
+ });
+ });
+}
+
+function getDetectedDevice() {
+ return import('tunerPicker').then(({default: tunerPicker}) => {
+ return new tunerPicker().show({
+ serverId: ApiClient.serverId()
+ });
+ });
+}
+
+function onTypeChange() {
+ const value = this.value;
+ const view = dom.parentWithClass(this, 'page');
+ const mayIncludeUnsupportedDrmChannels = value === 'hdhomerun';
+ const supportsTranscoding = value === 'hdhomerun';
+ const supportsFavorites = value === 'hdhomerun';
+ const supportsTunerIpAddress = value === 'hdhomerun';
+ const supportsTunerFileOrUrl = value === 'm3u';
+ const supportsStreamLooping = value === 'm3u';
+ const supportsTunerCount = value === 'm3u';
+ const supportsUserAgent = value === 'm3u';
+ const suppportsSubmit = value !== 'other';
+ const supportsSelectablePath = supportsTunerFileOrUrl;
+ const txtDevicePath = view.querySelector('.txtDevicePath');
+
+ if (supportsTunerIpAddress) {
+ txtDevicePath.label(globalize.translate('LabelTunerIpAddress'));
+ view.querySelector('.fldPath').classList.remove('hide');
+ } else if (supportsTunerFileOrUrl) {
+ txtDevicePath.label(globalize.translate('LabelFileOrUrl'));
+ view.querySelector('.fldPath').classList.remove('hide');
+ } else {
+ view.querySelector('.fldPath').classList.add('hide');
+ }
+
+ if (supportsSelectablePath) {
+ view.querySelector('.btnSelectPath').classList.remove('hide');
+ view.querySelector('.txtDevicePath').setAttribute('required', 'required');
+ } else {
+ view.querySelector('.btnSelectPath').classList.add('hide');
+ view.querySelector('.txtDevicePath').removeAttribute('required');
+ }
+
+ if (supportsUserAgent) {
+ view.querySelector('.fldUserAgent').classList.remove('hide');
+ } else {
+ view.querySelector('.fldUserAgent').classList.add('hide');
+ }
+
+ if (supportsFavorites) {
+ view.querySelector('.fldFavorites').classList.remove('hide');
+ } else {
+ view.querySelector('.fldFavorites').classList.add('hide');
+ }
+
+ if (supportsTranscoding) {
+ view.querySelector('.fldTranscode').classList.remove('hide');
+ } else {
+ view.querySelector('.fldTranscode').classList.add('hide');
+ }
+
+ if (supportsStreamLooping) {
+ view.querySelector('.fldStreamLoop').classList.remove('hide');
+ } else {
+ view.querySelector('.fldStreamLoop').classList.add('hide');
+ }
+
+ if (supportsTunerCount) {
+ view.querySelector('.fldTunerCount').classList.remove('hide');
+ view.querySelector('.txtTunerCount').setAttribute('required', 'required');
+ } else {
+ view.querySelector('.fldTunerCount').classList.add('hide');
+ view.querySelector('.txtTunerCount').removeAttribute('required');
+ }
+
+ if (mayIncludeUnsupportedDrmChannels) {
+ view.querySelector('.drmMessage').classList.remove('hide');
+ } else {
+ view.querySelector('.drmMessage').classList.add('hide');
+ }
+
+ if (suppportsSubmit) {
+ view.querySelector('.button-submit').classList.remove('hide');
+ } else {
+ view.querySelector('.button-submit').classList.add('hide');
+ }
+}
+
+export default function (view, params) {
+ if (!params.id) {
+ view.querySelector('.btnDetect').classList.remove('hide');
+ }
+
+ view.addEventListener('viewshow', function () {
+ const currentId = params.id;
+ fillTypes(view, currentId).then(function () {
+ reload(view, currentId);
+ });
+ });
+ view.querySelector('form').addEventListener('submit', function (e) {
+ submitForm(view);
+ e.preventDefault();
+ e.stopPropagation();
+ return false;
+ });
+ view.querySelector('.selectType').addEventListener('change', onTypeChange);
+ view.querySelector('.btnDetect').addEventListener('click', function () {
+ getDetectedDevice().then(function (info) {
+ fillTunerHostInfo(view, info);
+ });
+ });
+ view.querySelector('.btnSelectPath').addEventListener('click', function () {
+ import('directorybrowser').then(({default: directorybrowser}) => {
+ const picker = new directorybrowser();
+ picker.show({
+ includeFiles: true,
+ callback: function (path) {
+ if (path) {
+ view.querySelector('.txtDevicePath').value = path;
+ }
+
+ picker.close();
+ }
+ });
+ });
+ });
+}
diff --git a/src/controllers/movies/moviecollections.js b/src/controllers/movies/moviecollections.js
index 44904633fa..dc8fae3a7b 100644
--- a/src/controllers/movies/moviecollections.js
+++ b/src/controllers/movies/moviecollections.js
@@ -50,7 +50,7 @@ define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardB
var viewStyle = self.getCurrentViewStyle();
var itemsContainer = tabContent.querySelector('.itemsContainer');
- if ('List' == viewStyle) {
+ if (viewStyle == 'List') {
itemsContainer.classList.add('vertical-list');
itemsContainer.classList.remove('vertical-wrap');
} else {
diff --git a/src/controllers/movies/moviegenres.js b/src/controllers/movies/moviegenres.js
index 69450989e8..07334b4d91 100644
--- a/src/controllers/movies/moviegenres.js
+++ b/src/controllers/movies/moviegenres.js
@@ -56,13 +56,13 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
var elem = entry.target;
var id = elem.getAttribute('data-id');
var viewStyle = self.getCurrentViewStyle();
- var limit = 'Thumb' == viewStyle || 'ThumbCard' == viewStyle ? 5 : 9;
+ var limit = viewStyle == 'Thumb' || viewStyle == 'ThumbCard' ? 5 : 9;
if (enableScrollX()) {
limit = 10;
}
- var enableImageTypes = 'Thumb' == viewStyle || 'ThumbCard' == viewStyle ? 'Primary,Backdrop,Thumb' : 'Primary';
+ var enableImageTypes = viewStyle == 'Thumb' || viewStyle == 'ThumbCard' ? 'Primary,Backdrop,Thumb' : 'Primary';
var query = {
SortBy: 'SortName',
SortOrder: 'Ascending',
diff --git a/src/controllers/music/musicalbums.js b/src/controllers/music/musicalbums.js
index 9b4fcde327..7d03c91073 100644
--- a/src/controllers/music/musicalbums.js
+++ b/src/controllers/music/musicalbums.js
@@ -1,9 +1,18 @@
-define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'userSettings', 'globalize', 'emby-itemscontainer'], function (layoutManager, playbackManager, loading, events, libraryBrowser, imageLoader, AlphaPicker, listView, cardBuilder, userSettings, globalize) {
- 'use strict';
+import playbackManager from 'playbackManager';
+import loading from 'loading';
+import events from 'events';
+import libraryBrowser from 'libraryBrowser';
+import imageLoader from 'imageLoader';
+import AlphaPicker from 'alphaPicker';
+import listView from 'listView';
+import cardBuilder from 'cardBuilder';
+import * as userSettings from 'userSettings';
+import globalize from 'globalize';
+import 'emby-itemscontainer';
- libraryBrowser = libraryBrowser.default || libraryBrowser;
+/* eslint-disable indent */
- return function (view, params, tabContent) {
+ export default function (view, params, tabContent) {
function playAll() {
ApiClient.getItem(ApiClient.getCurrentUserId(), params.topParentId).then(function (item) {
playbackManager.play({
@@ -20,7 +29,7 @@ define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser
}
function getPageData() {
- var key = getSavedQueryKey();
+ const key = getSavedQueryKey();
if (!pageData) {
pageData = {
@@ -61,10 +70,10 @@ define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser
}
function onViewStyleChange() {
- var viewStyle = self.getCurrentViewStyle();
- var itemsContainer = tabContent.querySelector('.itemsContainer');
+ const viewStyle = self.getCurrentViewStyle();
+ const itemsContainer = tabContent.querySelector('.itemsContainer');
- if ('List' == viewStyle) {
+ if (viewStyle == 'List') {
itemsContainer.classList.add('vertical-list');
itemsContainer.classList.remove('vertical-wrap');
} else {
@@ -78,7 +87,7 @@ define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser
function reloadItems(page) {
loading.show();
isLoading = true;
- var query = getQuery();
+ const query = getQuery();
ApiClient.getItems(ApiClient.getCurrentUserId(), query).then(function (result) {
function onNextPageClick() {
if (isLoading) {
@@ -104,8 +113,8 @@ define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser
window.scrollTo(0, 0);
updateFilterControls(page);
- var html;
- var pagingHtml = libraryBrowser.getQueryPagingHtml({
+ let html;
+ const pagingHtml = libraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex,
limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
@@ -115,7 +124,7 @@ define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser
sortButton: false,
filterButton: false
});
- var viewStyle = self.getCurrentViewStyle();
+ const viewStyle = self.getCurrentViewStyle();
if (viewStyle == 'List') {
html = listView.getListViewHtml({
items: result.Items,
@@ -146,50 +155,48 @@ define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser
overlayPlayButton: true
});
}
- var i;
- var length;
- var elems = tabContent.querySelectorAll('.paging');
+ let elems = tabContent.querySelectorAll('.paging');
- for (i = 0, length = elems.length; i < length; i++) {
+ for (let i = 0, length = elems.length; i < length; i++) {
elems[i].innerHTML = pagingHtml;
}
elems = tabContent.querySelectorAll('.btnNextPage');
- for (i = 0, length = elems.length; i < length; i++) {
+ for (let i = 0, length = elems.length; i < length; i++) {
elems[i].addEventListener('click', onNextPageClick);
}
elems = tabContent.querySelectorAll('.btnPreviousPage');
- for (i = 0, length = elems.length; i < length; i++) {
+ for (let i = 0, length = elems.length; i < length; i++) {
elems[i].addEventListener('click', onPreviousPageClick);
}
- var itemsContainer = tabContent.querySelector('.itemsContainer');
+ const itemsContainer = tabContent.querySelector('.itemsContainer');
itemsContainer.innerHTML = html;
imageLoader.lazyChildren(itemsContainer);
libraryBrowser.saveQueryValues(getSavedQueryKey(), query);
loading.hide();
isLoading = false;
- require(['autoFocuser'], function (autoFocuser) {
+ import('autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(tabContent);
});
});
}
function updateFilterControls(tabContent) {
- var query = getQuery();
+ const query = getQuery();
self.alphaPicker.value(query.NameStartsWithOrGreater);
}
- var savedQueryKey;
- var pageData;
- var self = this;
- var isLoading = false;
+ let savedQueryKey;
+ let pageData;
+ const self = this;
+ let isLoading = false;
self.showFilterMenu = function () {
- require(['components/filterdialog/filterdialog'], function ({default: filterDialogFactory}) {
- var filterDialog = new filterDialogFactory({
+ import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
+ const filterDialog = new filterDialogFactory({
query: getQuery(),
mode: 'albums',
serverId: ApiClient.serverId()
@@ -207,17 +214,17 @@ define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser
};
function initPage(tabContent) {
- var alphaPickerElement = tabContent.querySelector('.alphaPicker');
- var itemsContainer = tabContent.querySelector('.itemsContainer');
+ const alphaPickerElement = tabContent.querySelector('.alphaPicker');
+ const itemsContainer = tabContent.querySelector('.itemsContainer');
alphaPickerElement.addEventListener('alphavaluechanged', function (e) {
- var newValue = e.detail.value;
- var query = getQuery();
+ const newValue = e.detail.value;
+ const query = getQuery();
query.NameStartsWithOrGreater = newValue;
query.StartIndex = 0;
reloadItems(tabContent);
});
- self.alphaPicker = new AlphaPicker.default({
+ self.alphaPicker = new AlphaPicker({
element: alphaPickerElement,
valueChangeEvent: 'click'
});
@@ -261,12 +268,12 @@ define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser
button: e.target
});
});
- var btnSelectView = tabContent.querySelector('.btnSelectView');
+ const btnSelectView = tabContent.querySelector('.btnSelectView');
btnSelectView.addEventListener('click', function (e) {
libraryBrowser.showLayoutMenu(e.target, self.getCurrentViewStyle(), 'List,Poster,PosterCard'.split(','));
});
btnSelectView.addEventListener('layoutchange', function (e) {
- var viewStyle = e.detail.viewStyle;
+ const viewStyle = e.detail.viewStyle;
getPageData().view = viewStyle;
libraryBrowser.saveViewSetting(getSavedQueryKey(), viewStyle);
getQuery().StartIndex = 0;
@@ -286,5 +293,6 @@ define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser
};
self.destroy = function () {};
- };
-});
+ }
+
+/* eslint-enable indent */
diff --git a/src/controllers/music/musicartists.js b/src/controllers/music/musicartists.js
index 3e86def538..23e0bbd459 100644
--- a/src/controllers/music/musicartists.js
+++ b/src/controllers/music/musicartists.js
@@ -1,15 +1,22 @@
-define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'apphost', 'userSettings', 'emby-itemscontainer'], function (layoutManager, loading, events, libraryBrowser, imageLoader, AlphaPicker, listView, cardBuilder, appHost, userSettings) {
- 'use strict';
+import loading from 'loading';
+import events from 'events';
+import libraryBrowser from 'libraryBrowser';
+import imageLoader from 'imageLoader';
+import AlphaPicker from 'alphaPicker';
+import listView from 'listView';
+import cardBuilder from 'cardBuilder';
+import * as userSettings from 'userSettings';
+import 'emby-itemscontainer';
- libraryBrowser = libraryBrowser.default || libraryBrowser;
+/* eslint-disable indent */
- return function (view, params, tabContent) {
+ export default function (view, params, tabContent) {
function getPageData(context) {
- var key = getSavedQueryKey(context);
- var pageData = data[key];
+ const key = getSavedQueryKey(context);
+ let pageData = data[key];
if (!pageData) {
- var queryValues = {
+ const queryValues = {
SortBy: 'SortName',
SortOrder: 'Ascending',
Recursive: true,
@@ -47,10 +54,10 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
}
function onViewStyleChange() {
- var viewStyle = self.getCurrentViewStyle();
- var itemsContainer = tabContent.querySelector('.itemsContainer');
+ const viewStyle = self.getCurrentViewStyle();
+ const itemsContainer = tabContent.querySelector('.itemsContainer');
- if ('List' == viewStyle) {
+ if (viewStyle == 'List') {
itemsContainer.classList.add('vertical-list');
itemsContainer.classList.remove('vertical-wrap');
} else {
@@ -64,8 +71,8 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
function reloadItems(page) {
loading.show();
isLoading = true;
- var query = getQuery(page);
- var promise = self.mode == 'albumartists' ?
+ const query = getQuery(page);
+ const promise = self.mode == 'albumartists' ?
ApiClient.getAlbumArtists(ApiClient.getCurrentUserId(), query) :
ApiClient.getArtists(ApiClient.getCurrentUserId(), query);
promise.then(function (result) {
@@ -93,8 +100,8 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
window.scrollTo(0, 0);
updateFilterControls(page);
- var html;
- var pagingHtml = libraryBrowser.getQueryPagingHtml({
+ let html;
+ const pagingHtml = libraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex,
limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
@@ -104,7 +111,7 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
sortButton: false,
filterButton: false
});
- var viewStyle = self.getCurrentViewStyle();
+ const viewStyle = self.getCurrentViewStyle();
if (viewStyle == 'List') {
html = listView.getListViewHtml({
items: result.Items,
@@ -131,49 +138,47 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
overlayPlayButton: true
});
}
- var i;
- var length;
- var elems = tabContent.querySelectorAll('.paging');
+ let elems = tabContent.querySelectorAll('.paging');
- for (i = 0, length = elems.length; i < length; i++) {
+ for (let i = 0, length = elems.length; i < length; i++) {
elems[i].innerHTML = pagingHtml;
}
elems = tabContent.querySelectorAll('.btnNextPage');
- for (i = 0, length = elems.length; i < length; i++) {
+ for (let i = 0, length = elems.length; i < length; i++) {
elems[i].addEventListener('click', onNextPageClick);
}
elems = tabContent.querySelectorAll('.btnPreviousPage');
- for (i = 0, length = elems.length; i < length; i++) {
+ for (let i = 0, length = elems.length; i < length; i++) {
elems[i].addEventListener('click', onPreviousPageClick);
}
- var itemsContainer = tabContent.querySelector('.itemsContainer');
+ const itemsContainer = tabContent.querySelector('.itemsContainer');
itemsContainer.innerHTML = html;
imageLoader.lazyChildren(itemsContainer);
libraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
loading.hide();
isLoading = false;
- require(['autoFocuser'], function (autoFocuser) {
+ import('autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(tabContent);
});
});
}
function updateFilterControls(tabContent) {
- var query = getQuery(tabContent);
+ const query = getQuery(tabContent);
self.alphaPicker.value(query.NameStartsWithOrGreater);
}
- var self = this;
- var data = {};
- var isLoading = false;
+ const self = this;
+ const data = {};
+ let isLoading = false;
self.showFilterMenu = function () {
- require(['components/filterdialog/filterdialog'], function ({default: filterDialogFactory}) {
- var filterDialog = new filterDialogFactory({
+ import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
+ const filterDialog = new filterDialogFactory({
query: getQuery(tabContent),
mode: self.mode,
serverId: ApiClient.serverId()
@@ -191,17 +196,17 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
};
function initPage(tabContent) {
- var alphaPickerElement = tabContent.querySelector('.alphaPicker');
- var itemsContainer = tabContent.querySelector('.itemsContainer');
+ const alphaPickerElement = tabContent.querySelector('.alphaPicker');
+ const itemsContainer = tabContent.querySelector('.itemsContainer');
alphaPickerElement.addEventListener('alphavaluechanged', function (e) {
- var newValue = e.detail.value;
- var query = getQuery(tabContent);
+ const newValue = e.detail.value;
+ const query = getQuery(tabContent);
query.NameStartsWithOrGreater = newValue;
query.StartIndex = 0;
reloadItems(tabContent);
});
- self.alphaPicker = new AlphaPicker.default({
+ self.alphaPicker = new AlphaPicker({
element: alphaPickerElement,
valueChangeEvent: 'click'
});
@@ -213,12 +218,12 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
tabContent.querySelector('.btnFilter').addEventListener('click', function () {
self.showFilterMenu();
});
- var btnSelectView = tabContent.querySelector('.btnSelectView');
+ const btnSelectView = tabContent.querySelector('.btnSelectView');
btnSelectView.addEventListener('click', function (e) {
libraryBrowser.showLayoutMenu(e.target, self.getCurrentViewStyle(), 'List,Poster,PosterCard'.split(','));
});
btnSelectView.addEventListener('layoutchange', function (e) {
- var viewStyle = e.detail.viewStyle;
+ const viewStyle = e.detail.viewStyle;
getPageData(tabContent).view = viewStyle;
libraryBrowser.saveViewSetting(getSavedQueryKey(tabContent), viewStyle);
getQuery(tabContent).StartIndex = 0;
@@ -236,5 +241,6 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
};
self.destroy = function () {};
- };
-});
+ }
+
+/* eslint-enable indent */
diff --git a/src/controllers/music/musicgenres.js b/src/controllers/music/musicgenres.js
index 948c4da7dd..29e0d888e4 100644
--- a/src/controllers/music/musicgenres.js
+++ b/src/controllers/music/musicgenres.js
@@ -1,12 +1,14 @@
-define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'loading'], function (libraryBrowser, cardBuilder, appHost, imageLoader, loading) {
- 'use strict';
+import libraryBrowser from 'libraryBrowser';
+import cardBuilder from 'cardBuilder';
+import imageLoader from 'imageLoader';
+import loading from 'loading';
- libraryBrowser = libraryBrowser.default || libraryBrowser;
+/* eslint-disable indent */
- return function (view, params, tabContent) {
+ export default function (view, params, tabContent) {
function getPageData() {
- var key = getSavedQueryKey();
- var pageData = data[key];
+ const key = getSavedQueryKey();
+ let pageData = data[key];
if (!pageData) {
pageData = data[key] = {
@@ -36,15 +38,15 @@ define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'loading'], f
function getPromise() {
loading.show();
- var query = getQuery();
+ const query = getQuery();
return ApiClient.getGenres(ApiClient.getCurrentUserId(), query);
}
function reloadItems(context, promise) {
- var query = getQuery();
+ const query = getQuery();
promise.then(function (result) {
- var html = '';
- var viewStyle = self.getCurrentViewStyle();
+ let html = '';
+ const viewStyle = self.getCurrentViewStyle();
if (viewStyle == 'Thumb') {
html = cardBuilder.getCardsHtml({
@@ -84,13 +86,13 @@ define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'loading'], f
});
}
- var elem = context.querySelector('#items');
+ const elem = context.querySelector('#items');
elem.innerHTML = html;
imageLoader.lazyChildren(elem);
libraryBrowser.saveQueryValues(getSavedQueryKey(), query);
loading.hide();
- require(['autoFocuser'], function (autoFocuser) {
+ import('autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(context);
});
});
@@ -101,8 +103,8 @@ define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'loading'], f
self.renderTab();
}
- var self = this;
- var data = {};
+ const self = this;
+ const data = {};
self.getViewStyles = function () {
return 'Poster,PosterCard,Thumb,ThumbCard'.split(',');
@@ -119,7 +121,7 @@ define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'loading'], f
};
self.enableViewSelection = true;
- var promise;
+ let promise;
self.preRender = function () {
promise = getPromise();
@@ -128,5 +130,6 @@ define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'loading'], f
self.renderTab = function () {
reloadItems(tabContent, promise);
};
- };
-});
+ }
+
+/* eslint-enable indent */
diff --git a/src/controllers/music/musicplaylists.js b/src/controllers/music/musicplaylists.js
index 19c08812f9..befeafcf4c 100644
--- a/src/controllers/music/musicplaylists.js
+++ b/src/controllers/music/musicplaylists.js
@@ -1,12 +1,14 @@
-define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'loading'], function (libraryBrowser, cardBuilder, appHost, imageLoader, loading) {
- 'use strict';
+import libraryBrowser from 'libraryBrowser';
+import cardBuilder from 'cardBuilder';
+import imageLoader from 'imageLoader';
+import loading from 'loading';
- libraryBrowser = libraryBrowser.default || libraryBrowser;
+/* eslint-disable indent */
- return function (view, params, tabContent) {
+ export default function (view, params, tabContent) {
function getPageData() {
- var key = getSavedQueryKey();
- var pageData = data[key];
+ const key = getSavedQueryKey();
+ let pageData = data[key];
if (!pageData) {
pageData = data[key] = {
@@ -37,14 +39,14 @@ define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'loading'], f
function getPromise() {
loading.show();
- var query = getQuery();
+ const query = getQuery();
return ApiClient.getItems(ApiClient.getCurrentUserId(), query);
}
function reloadItems(context, promise) {
- var query = getQuery();
+ const query = getQuery();
promise.then(function (result) {
- var html = '';
+ let html = '';
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: 'square',
@@ -55,26 +57,26 @@ define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'loading'], f
allowBottomPadding: true,
cardLayout: false
});
- var elem = context.querySelector('#items');
+ const elem = context.querySelector('#items');
elem.innerHTML = html;
imageLoader.lazyChildren(elem);
libraryBrowser.saveQueryValues(getSavedQueryKey(), query);
loading.hide();
- require(['autoFocuser'], function (autoFocuser) {
+ import('autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(context);
});
});
}
- var self = this;
- var data = {};
+ const self = this;
+ const data = {};
self.getCurrentViewStyle = function () {
return getPageData().view;
};
- var promise;
+ let promise;
self.preRender = function () {
promise = getPromise();
@@ -83,5 +85,6 @@ define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'loading'], f
self.renderTab = function () {
reloadItems(tabContent, promise);
};
- };
-});
+ }
+
+/* eslint-enable indent */
diff --git a/src/controllers/music/musicrecommended.js b/src/controllers/music/musicrecommended.js
index 0eecef0bfb..db7dac9547 100644
--- a/src/controllers/music/musicrecommended.js
+++ b/src/controllers/music/musicrecommended.js
@@ -1,8 +1,24 @@
-define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', 'cardBuilder', 'dom', 'apphost', 'imageLoader', 'libraryMenu', 'playbackManager', 'mainTabsManager', 'globalize', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button', 'flexStyles'], function (browser, layoutManager, userSettings, inputManager, loading, cardBuilder, dom, appHost, imageLoader, libraryMenu, playbackManager, mainTabsManager, globalize) {
- 'use strict';
+import browser from 'browser';
+import layoutManager from 'layoutManager';
+import * as userSettings from 'userSettings';
+import inputManager from 'inputManager';
+import loading from 'loading';
+import cardBuilder from 'cardBuilder';
+import dom from 'dom';
+import imageLoader from 'imageLoader';
+import libraryMenu from 'libraryMenu';
+import * as mainTabsManager from 'mainTabsManager';
+import globalize from 'globalize';
+import 'scrollStyles';
+import 'emby-itemscontainer';
+import 'emby-tabs';
+import 'emby-button';
+import 'flexStyles';
+
+/* eslint-disable indent */
function itemsPerRow() {
- var screenWidth = dom.getWindowSize().innerWidth;
+ const screenWidth = dom.getWindowSize().innerWidth;
if (screenWidth >= 1920) {
return 9;
@@ -29,8 +45,8 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
function loadLatest(page, parentId) {
loading.show();
- var userId = ApiClient.getCurrentUserId();
- var options = {
+ const userId = ApiClient.getCurrentUserId();
+ const options = {
IncludeItemTypes: 'Audio',
Limit: enableScrollX() ? 3 * itemsPerRow() : 2 * itemsPerRow(),
Fields: 'PrimaryImageAspectRatio,BasicSyncInfo',
@@ -41,7 +57,6 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
};
ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).then(function (items) {
var elem = page.querySelector('#recentlyAddedSongs');
-
elem.innerHTML = cardBuilder.getCardsHtml({
items: items,
showUnplayedIndicator: false,
@@ -59,14 +74,14 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
imageLoader.lazyChildren(elem);
loading.hide();
- require(['autoFocuser'], function (autoFocuser) {
+ import('autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(page);
});
});
}
function loadRecentlyPlayed(page, parentId) {
- var options = {
+ const options = {
SortBy: 'DatePlayed',
SortOrder: 'Descending',
IncludeItemTypes: 'Audio',
@@ -80,7 +95,7 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
EnableTotalRecordCount: false
};
ApiClient.getItems(ApiClient.getCurrentUserId(), options).then(function (result) {
- var elem = page.querySelector('#recentlyPlayed');
+ const elem = page.querySelector('#recentlyPlayed');
if (result.Items.length) {
elem.classList.remove('hide');
@@ -89,6 +104,7 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
}
var itemsContainer = elem.querySelector('.itemsContainer');
+
itemsContainer.innerHTML = cardBuilder.getCardsHtml({
items: result.Items,
showUnplayedIndicator: false,
@@ -108,7 +124,7 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
}
function loadFrequentlyPlayed(page, parentId) {
- var options = {
+ const options = {
SortBy: 'PlayCount',
SortOrder: 'Descending',
IncludeItemTypes: 'Audio',
@@ -122,7 +138,7 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
EnableTotalRecordCount: false
};
ApiClient.getItems(ApiClient.getCurrentUserId(), options).then(function (result) {
- var elem = page.querySelector('#topPlayed');
+ const elem = page.querySelector('#topPlayed');
if (result.Items.length) {
elem.classList.remove('hide');
@@ -155,7 +171,7 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
loadRecentlyPlayed(tabContent, parentId);
loadFrequentlyPlayed(tabContent, parentId);
- require(['components/favoriteitems'], function (favoriteItems) {
+ import('components/favoriteitems').then(({default: favoriteItems}) => {
favoriteItems.render(tabContent, ApiClient.getCurrentUserId(), parentId, ['favoriteArtists', 'favoriteAlbums', 'favoriteSongs']);
});
}
@@ -206,10 +222,10 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
}
}
- return function (view, params) {
+ export default function (view, params) {
function reload() {
loading.show();
- var tabContent = view.querySelector(".pageTabContent[data-index='0']");
+ const tabContent = view.querySelector(".pageTabContent[data-index='0']");
loadSuggestionsTab(view, tabContent, params.topParentId);
}
@@ -252,46 +268,48 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
}
function getTabController(page, index, callback) {
- var depends = [];
+ let depends;
switch (index) {
case 0:
+ depends = 'controllers/music/musicrecommended';
break;
case 1:
- depends.push('controllers/music/musicalbums');
+ depends = 'controllers/music/musicalbums';
break;
case 2:
case 3:
- depends.push('controllers/music/musicartists');
+ depends = 'controllers/music/musicartists';
break;
case 4:
- depends.push('controllers/music/musicplaylists');
+ depends = 'controllers/music/musicplaylists';
break;
case 5:
- depends.push('controllers/music/songs');
+ depends = 'controllers/music/songs';
break;
case 6:
- depends.push('controllers/music/musicgenres');
+ depends = 'controllers/music/musicgenres';
break;
case 7:
- depends.push('scripts/searchtab');
+ depends = 'scripts/searchtab';
+ break;
}
- require(depends, function (controllerFactory) {
- var tabContent;
+ import(depends).then(({default: controllerFactory}) => {
+ let tabContent;
- if (0 == index) {
+ if (index == 0) {
tabContent = view.querySelector(".pageTabContent[data-index='" + index + "']");
self.tabContent = tabContent;
}
- var controller = tabControllers[index];
+ let controller = tabControllers[index];
if (!controller) {
tabContent = view.querySelector(".pageTabContent[data-index='" + index + "']");
@@ -353,10 +371,10 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
var currentTabIndex = parseInt(params.tab || getDefaultTabIndex(params.topParentId));
self.initTab = function () {
- var tabContent = view.querySelector(".pageTabContent[data-index='0']");
- var containers = tabContent.querySelectorAll('.itemsContainer');
+ const tabContent = view.querySelector(".pageTabContent[data-index='0']");
+ const containers = tabContent.querySelectorAll('.itemsContainer');
- for (var i = 0, length = containers.length; i < length; i++) {
+ for (let i = 0, length = containers.length; i < length; i++) {
setScrollClasses(containers[i], enableScrollX());
}
};
@@ -365,12 +383,12 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
reload();
};
- var tabControllers = [];
- var renderedTabs = [];
+ const tabControllers = [];
+ const renderedTabs = [];
view.addEventListener('viewshow', function (e) {
initTabs();
if (!view.getAttribute('data-title')) {
- var parentId = params.topParentId;
+ const parentId = params.topParentId;
if (parentId) {
ApiClient.getItem(ApiClient.getCurrentUserId(), parentId).then(function (item) {
@@ -395,5 +413,6 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
}
});
});
- };
-});
+ }
+
+/* eslint-enable indent */
diff --git a/src/controllers/music/songs.js b/src/controllers/music/songs.js
index 74c5106860..4c4f229e58 100644
--- a/src/controllers/music/songs.js
+++ b/src/controllers/music/songs.js
@@ -1,12 +1,18 @@
-define(['events', 'libraryBrowser', 'imageLoader', 'listView', 'loading', 'userSettings', 'globalize', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, listView, loading, userSettings, globalize) {
- 'use strict';
+import events from 'events';
+import libraryBrowser from 'libraryBrowser';
+import imageLoader from 'imageLoader';
+import listView from 'listView';
+import loading from 'loading';
+import * as userSettings from 'userSettings';
+import globalize from 'globalize';
+import 'emby-itemscontainer';
- libraryBrowser = libraryBrowser.default || libraryBrowser;
+/* eslint-disable indent */
- return function (view, params, tabContent) {
+ export default function (view, params, tabContent) {
function getPageData(context) {
- var key = getSavedQueryKey(context);
- var pageData = data[key];
+ const key = getSavedQueryKey(context);
+ let pageData = data[key];
if (!pageData) {
pageData = data[key] = {
@@ -48,7 +54,7 @@ define(['events', 'libraryBrowser', 'imageLoader', 'listView', 'loading', 'userS
function reloadItems(page) {
loading.show();
isLoading = true;
- var query = getQuery(page);
+ const query = getQuery(page);
ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
function onNextPageClick() {
if (isLoading) {
@@ -73,9 +79,7 @@ define(['events', 'libraryBrowser', 'imageLoader', 'listView', 'loading', 'userS
}
window.scrollTo(0, 0);
- var i;
- var length;
- var pagingHtml = libraryBrowser.getQueryPagingHtml({
+ const pagingHtml = libraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex,
limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
@@ -85,49 +89,49 @@ define(['events', 'libraryBrowser', 'imageLoader', 'listView', 'loading', 'userS
sortButton: false,
filterButton: false
});
- var html = listView.getListViewHtml({
+ const html = listView.getListViewHtml({
items: result.Items,
action: 'playallfromhere',
smallIcon: true,
artist: true,
addToListButton: true
});
- var elems = tabContent.querySelectorAll('.paging');
+ let elems = tabContent.querySelectorAll('.paging');
- for (i = 0, length = elems.length; i < length; i++) {
+ for (let i = 0, length = elems.length; i < length; i++) {
elems[i].innerHTML = pagingHtml;
}
elems = tabContent.querySelectorAll('.btnNextPage');
- for (i = 0, length = elems.length; i < length; i++) {
+ for (let i = 0, length = elems.length; i < length; i++) {
elems[i].addEventListener('click', onNextPageClick);
}
elems = tabContent.querySelectorAll('.btnPreviousPage');
- for (i = 0, length = elems.length; i < length; i++) {
+ for (let i = 0, length = elems.length; i < length; i++) {
elems[i].addEventListener('click', onPreviousPageClick);
}
- var itemsContainer = tabContent.querySelector('.itemsContainer');
+ const itemsContainer = tabContent.querySelector('.itemsContainer');
itemsContainer.innerHTML = html;
imageLoader.lazyChildren(itemsContainer);
libraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
loading.hide();
isLoading = false;
- require(['autoFocuser'], function (autoFocuser) {
+ import('autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(page);
});
});
}
- var self = this;
- var data = {};
- var isLoading = false;
+ const self = this;
+ const data = {};
+ let isLoading = false;
self.showFilterMenu = function () {
- require(['components/filterdialog/filterdialog'], function ({default: filterDialogFactory}) {
- var filterDialog = new filterDialogFactory({
+ import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
+ const filterDialog = new filterDialogFactory({
query: getQuery(tabContent),
mode: 'songs',
serverId: ApiClient.serverId()
@@ -195,5 +199,6 @@ define(['events', 'libraryBrowser', 'imageLoader', 'listView', 'loading', 'userS
};
self.destroy = function () {};
- };
-});
+ }
+
+/* eslint-enable indent */
diff --git a/src/controllers/playback/video/index.html b/src/controllers/playback/video/index.html
index 452c8a9af8..cf3d0beff8 100644
--- a/src/controllers/playback/video/index.html
+++ b/src/controllers/playback/video/index.html
@@ -28,7 +28,7 @@
-
-