';
@@ -119,7 +135,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
}
function downloadRemoteImage(page, apiClient, url, type, provider) {
- var options = getBaseRemoteOptions();
+ const options = getBaseRemoteOptions();
options.Type = type;
options.ImageUrl = url;
@@ -129,7 +145,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
apiClient.downloadRemoteImage(options).then(function () {
hasChanges = true;
- var dlg = dom.parentWithClass(page, 'dialog');
+ const dlg = dom.parentWithClass(page, 'dialog');
dialogHelper.close(dlg);
});
}
@@ -139,17 +155,17 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
}
function getRemoteImageHtml(image, imageType, apiClient) {
- var tagName = layoutManager.tv ? 'button' : 'div';
- var enableFooterButtons = !layoutManager.tv;
+ const tagName = layoutManager.tv ? 'button' : 'div';
+ const enableFooterButtons = !layoutManager.tv;
// TODO move card creation code to Card component
- var html = '';
+ let html = '';
- var cssClass = 'card scalableCard imageEditorCard';
- var cardBoxCssClass = 'cardBox visualCardBox';
+ let cssClass = 'card scalableCard imageEditorCard';
+ const cardBoxCssClass = 'cardBox visualCardBox';
- var shape = 'backdrop';
+ let shape;
if (imageType === 'Backdrop' || imageType === 'Art' || imageType === 'Thumb' || imageType === 'Logo') {
shape = 'backdrop';
} else if (imageType === 'Banner') {
@@ -284,14 +300,14 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
});
page.addEventListener('click', function (e) {
- var btnDownloadRemoteImage = dom.parentWithClass(e.target, 'btnDownloadRemoteImage');
+ const btnDownloadRemoteImage = dom.parentWithClass(e.target, 'btnDownloadRemoteImage');
if (btnDownloadRemoteImage) {
- var card = dom.parentWithClass(btnDownloadRemoteImage, 'card');
+ const card = dom.parentWithClass(btnDownloadRemoteImage, 'card');
downloadRemoteImage(page, apiClient, card.getAttribute('data-imageurl'), card.getAttribute('data-imagetype'), card.getAttribute('data-imageprovider'));
return;
}
- var btnImageCard = dom.parentWithClass(e.target, 'btnImageCard');
+ const btnImageCard = dom.parentWithClass(e.target, 'btnImageCard');
if (btnImageCard) {
downloadRemoteImage(page, apiClient, btnImageCard.getAttribute('data-imageurl'), btnImageCard.getAttribute('data-imagetype'), btnImageCard.getAttribute('data-imageprovider'));
}
@@ -302,12 +318,12 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
loading.show();
require(['text!./imageDownloader.template.html'], function (template) {
- var apiClient = connectionManager.getApiClient(serverId);
+ const apiClient = connectionManager.getApiClient(serverId);
currentItemId = itemId;
currentItemType = itemType;
- var dialogOptions = {
+ const dialogOptions = {
removeOnClose: true
};
@@ -317,7 +333,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
dialogOptions.size = 'small';
}
- var dlg = dialogHelper.createDialog(dialogOptions);
+ const dlg = dialogHelper.createDialog(dialogOptions);
dlg.innerHTML = globalize.translateHtml(template, 'core');
@@ -330,7 +346,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
dialogHelper.open(dlg);
- var editorContent = dlg.querySelector('.formDialogContent');
+ const editorContent = dlg.querySelector('.formDialogContent');
initEditor(editorContent, apiClient);
dlg.querySelector('.btnCancel').addEventListener('click', function () {
@@ -342,7 +358,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
}
function onDialogClosed() {
- var dlg = this;
+ const dlg = this;
if (layoutManager.tv) {
scrollHelper.centerFocus.off(dlg, false);
@@ -356,18 +372,20 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
}
}
- return {
- show: function (itemId, serverId, itemType, imageType) {
- return new Promise(function (resolve, reject) {
- currentResolve = resolve;
- currentReject = reject;
- hasChanges = false;
- browsableImageStartIndex = 0;
- browsableImageType = imageType || 'Primary';
- selectedProvider = null;
+export function show(itemId, serverId, itemType, imageType) {
+ return new Promise(function (resolve, reject) {
+ currentResolve = resolve;
+ currentReject = reject;
+ hasChanges = false;
+ browsableImageStartIndex = 0;
+ browsableImageType = imageType || 'Primary';
+ selectedProvider = null;
+ showEditor(itemId, serverId, itemType);
+ });
+}
- showEditor(itemId, serverId, itemType);
- });
- }
- };
-});
+export default {
+ show: show
+};
+
+/* eslint-enable indent */
diff --git a/src/components/imageOptionsEditor/imageOptionsEditor.js b/src/components/imageOptionsEditor/imageOptionsEditor.js
index 6660ecf74c..41fe9b4c94 100644
--- a/src/components/imageOptionsEditor/imageOptionsEditor.js
+++ b/src/components/imageOptionsEditor/imageOptionsEditor.js
@@ -16,7 +16,7 @@ import 'emby-input';
return {
Type: type,
MinWidth: 0,
- Limit: 'Primary' === type ? 1 : 0
+ Limit: type === 'Primary' ? 1 : 0
};
}
diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js
index 125a2dc062..46e2dae999 100644
--- a/src/components/imageeditor/imageeditor.js
+++ b/src/components/imageeditor/imageeditor.js
@@ -1,13 +1,29 @@
-define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', 'focusManager', 'globalize', 'scrollHelper', 'imageLoader', 'require', 'browser', 'apphost', 'cardStyle', 'formDialogStyle', 'emby-button', 'paper-icon-button-light', 'css!./imageeditor'], function (dialogHelper, connectionManager, loading, dom, layoutManager, focusManager, globalize, scrollHelper, imageLoader, require, browser, appHost) {
- 'use strict';
+import dialogHelper from 'dialogHelper';
+import connectionManager from 'connectionManager';
+import loading from 'loading';
+import dom from 'dom';
+import layoutManager from 'layoutManager';
+import focusManager from 'focusManager';
+import globalize from 'globalize';
+import scrollHelper from 'scrollHelper';
+import imageLoader from 'imageLoader';
+import browser from 'browser';
+import appHost from 'apphost';
+import 'cardStyle';
+import 'formDialogStyle';
+import 'emby-button';
+import 'paper-icon-button-light';
+import 'css!./imageeditor';
- var enableFocusTransform = !browser.slow && !browser.edge;
+/* eslint-disable indent */
- var currentItem;
- var hasChanges = false;
+ const enableFocusTransform = !browser.slow && !browser.edge;
+
+ let currentItem;
+ let hasChanges = false;
function getBaseRemoteOptions() {
- var options = {};
+ const options = {};
options.itemId = currentItem.Id;
@@ -17,7 +33,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
function reload(page, item, focusContext) {
loading.show();
- var apiClient;
+ let apiClient;
if (item) {
apiClient = connectionManager.getApiClient(item.ServerId);
@@ -32,7 +48,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
function addListeners(container, className, eventName, fn) {
container.addEventListener(eventName, function (e) {
- var elem = dom.parentWithClass(e.target, className);
+ const elem = dom.parentWithClass(e.target, className);
if (elem) {
fn.call(elem, e);
}
@@ -43,8 +59,8 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
currentItem = item;
apiClient.getRemoteImageProviders(getBaseRemoteOptions()).then(function (providers) {
- var btnBrowseAllImages = page.querySelectorAll('.btnBrowseAllImages');
- for (var i = 0, length = btnBrowseAllImages.length; i < length; i++) {
+ const btnBrowseAllImages = page.querySelectorAll('.btnBrowseAllImages');
+ for (let i = 0, length = btnBrowseAllImages.length; i < length; i++) {
if (providers.length) {
btnBrowseAllImages[i].classList.remove('hide');
} else {
@@ -87,10 +103,10 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
function getCardHtml(image, index, numImages, apiClient, imageProviders, imageSize, tagName, enableFooterButtons) {
// TODO move card creation code to Card component
- var html = '';
+ let html = '';
- var cssClass = 'card scalableCard imageEditorCard';
- var cardBoxCssClass = 'cardBox visualCardBox';
+ let cssClass = 'card scalableCard imageEditorCard';
+ const cardBoxCssClass = 'cardBox visualCardBox';
cssClass += ' backdropCard backdropCard-scalable';
@@ -120,7 +136,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
html += '
';
- var imageUrl = getImageUrl(currentItem, apiClient, image.ImageType, image.ImageIndex, { maxWidth: imageSize });
+ const imageUrl = getImageUrl(currentItem, apiClient, image.ImageType, image.ImageIndex, { maxWidth: imageSize });
html += '
';
@@ -172,7 +188,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
}
function deleteImage(context, itemId, type, index, apiClient, enableConfirmation) {
- var afterConfirm = function () {
+ const afterConfirm = function () {
apiClient.deleteItemImage(itemId, type, index).then(function () {
hasChanges = true;
reload(context);
@@ -184,8 +200,8 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
return;
}
- require(['confirm'], function (confirm) {
- confirm.default({
+ import('confirm').then(({default: confirm}) => {
+ confirm({
text: globalize.translate('ConfirmDeleteImage'),
confirmText: globalize.translate('Delete'),
@@ -200,27 +216,26 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
hasChanges = true;
reload(context, null, focusContext);
}, function () {
- require(['alert'], function (alert) {
- alert(globalize.translate('DefaultErrorMessage'));
+ import('alert').then(({default: alert}) => {
+ alert(globalize.translate('ErrorDefault'));
});
});
}
function renderImages(page, item, apiClient, images, imageProviders, elem) {
- var html = '';
+ let html = '';
- var imageSize = 300;
- var windowSize = dom.getWindowSize();
+ let imageSize = 300;
+ const windowSize = dom.getWindowSize();
if (windowSize.innerWidth >= 1280) {
imageSize = Math.round(windowSize.innerWidth / 4);
}
- var tagName = layoutManager.tv ? 'button' : 'div';
- var enableFooterButtons = !layoutManager.tv;
-
- for (var i = 0, length = images.length; i < length; i++) {
- var image = images[i];
+ const tagName = layoutManager.tv ? 'button' : 'div';
+ const enableFooterButtons = !layoutManager.tv;
+ for (let i = 0, length = images.length; i < length; i++) {
+ const image = images[i];
html += getCardHtml(image, i, length, apiClient, imageProviders, imageSize, tagName, enableFooterButtons);
}
@@ -229,7 +244,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
}
function renderStandardImages(page, apiClient, item, imageInfos, imageProviders) {
- var images = imageInfos.filter(function (i) {
+ const images = imageInfos.filter(function (i) {
return i.ImageType !== 'Screenshot' && i.ImageType !== 'Backdrop' && i.ImageType !== 'Chapter';
});
@@ -237,7 +252,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
}
function renderBackdrops(page, apiClient, item, imageInfos, imageProviders) {
- var images = imageInfos.filter(function (i) {
+ const images = imageInfos.filter(function (i) {
return i.ImageType === 'Backdrop';
}).sort(function (a, b) {
return a.ImageIndex - b.ImageIndex;
@@ -252,7 +267,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
}
function renderScreenshots(page, apiClient, item, imageInfos, imageProviders) {
- var images = imageInfos.filter(function (i) {
+ const images = imageInfos.filter(function (i) {
return i.ImageType === 'Screenshot';
}).sort(function (a, b) {
return a.ImageIndex - b.ImageIndex;
@@ -267,7 +282,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
}
function showImageDownloader(page, imageType) {
- require(['imageDownloader'], function (ImageDownloader) {
+ import('imageDownloader').then(({default: ImageDownloader}) => {
ImageDownloader.show(currentItem.Id, currentItem.ServerId, currentItem.Type, imageType).then(function () {
hasChanges = true;
reload(page);
@@ -276,17 +291,17 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
}
function showActionSheet(context, imageCard) {
- var itemId = imageCard.getAttribute('data-id');
- var serverId = imageCard.getAttribute('data-serverid');
- var apiClient = connectionManager.getApiClient(serverId);
+ const itemId = imageCard.getAttribute('data-id');
+ const serverId = imageCard.getAttribute('data-serverid');
+ const apiClient = connectionManager.getApiClient(serverId);
- var type = imageCard.getAttribute('data-imagetype');
- var index = parseInt(imageCard.getAttribute('data-index'));
- var providerCount = parseInt(imageCard.getAttribute('data-providers'));
- var numImages = parseInt(imageCard.getAttribute('data-numimages'));
+ const type = imageCard.getAttribute('data-imagetype');
+ const index = parseInt(imageCard.getAttribute('data-index'));
+ const providerCount = parseInt(imageCard.getAttribute('data-providers'));
+ const numImages = parseInt(imageCard.getAttribute('data-numimages'));
- require(['actionsheet'], function (actionSheet) {
- var commands = [];
+ import('actionsheet').then(({default: actionSheet}) => {
+ const commands = [];
commands.push({
name: globalize.translate('Delete'),
@@ -343,9 +358,9 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
}
function initEditor(context, options) {
- var uploadButtons = context.querySelectorAll('.btnOpenUploadMenu');
- var isFileInputSupported = appHost.supports('fileinput');
- for (var i = 0, length = uploadButtons.length; i < length; i++) {
+ const uploadButtons = context.querySelectorAll('.btnOpenUploadMenu');
+ const isFileInputSupported = appHost.supports('fileinput');
+ for (let i = 0, length = uploadButtons.length; i < length; i++) {
if (isFileInputSupported) {
uploadButtons[i].classList.remove('hide');
} else {
@@ -354,9 +369,9 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
}
addListeners(context, 'btnOpenUploadMenu', 'click', function () {
- var imageType = this.getAttribute('data-imagetype');
+ const imageType = this.getAttribute('data-imagetype');
- require(['imageUploader'], function (imageUploader) {
+ import('imageUploader').then(({default: imageUploader}) => {
imageUploader.show({
theme: options.theme,
@@ -386,32 +401,32 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
});
addListeners(context, 'btnDeleteImage', 'click', function () {
- var type = this.getAttribute('data-imagetype');
- var index = this.getAttribute('data-index');
+ const type = this.getAttribute('data-imagetype');
+ let index = this.getAttribute('data-index');
index = index === 'null' ? null : parseInt(index);
- var apiClient = connectionManager.getApiClient(currentItem.ServerId);
+ const apiClient = connectionManager.getApiClient(currentItem.ServerId);
deleteImage(context, currentItem.Id, type, index, apiClient, true);
});
addListeners(context, 'btnMoveImage', 'click', function () {
- var type = this.getAttribute('data-imagetype');
- var index = this.getAttribute('data-index');
- var newIndex = this.getAttribute('data-newindex');
- var apiClient = connectionManager.getApiClient(currentItem.ServerId);
+ const type = this.getAttribute('data-imagetype');
+ const index = this.getAttribute('data-index');
+ const newIndex = this.getAttribute('data-newindex');
+ const apiClient = connectionManager.getApiClient(currentItem.ServerId);
moveImage(context, apiClient, currentItem.Id, type, index, newIndex, dom.parentWithClass(this, 'itemsContainer'));
});
}
function showEditor(options, resolve, reject) {
- var itemId = options.itemId;
- var serverId = options.serverId;
+ const itemId = options.itemId;
+ const serverId = options.serverId;
loading.show();
- require(['text!./imageeditor.template.html'], function (template) {
- var apiClient = connectionManager.getApiClient(serverId);
+ import('text!./imageeditor.template.html').then(({default: template}) => {
+ const apiClient = connectionManager.getApiClient(serverId);
apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
- var dialogOptions = {
+ const dialogOptions = {
removeOnClose: true
};
@@ -421,7 +436,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
dialogOptions.size = 'small';
}
- var dlg = dialogHelper.createDialog(dialogOptions);
+ const dlg = dialogHelper.createDialog(dialogOptions);
dlg.classList.add('formDialog');
@@ -459,13 +474,15 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
});
}
- return {
- show: function (options) {
- return new Promise(function (resolve, reject) {
- hasChanges = false;
+export function show (options) {
+ return new Promise(function (resolve, reject) {
+ hasChanges = false;
+ showEditor(options, resolve, reject);
+ });
+}
- showEditor(options, resolve, reject);
- });
- }
- };
-});
+export default {
+ show
+};
+
+/* eslint-enable indent */
diff --git a/src/components/images/imageLoader.js b/src/components/images/imageLoader.js
index c9d3e6fdb2..0effcc7a57 100644
--- a/src/components/images/imageLoader.js
+++ b/src/components/images/imageLoader.js
@@ -205,7 +205,7 @@ import 'css!./style';
/* eslint-enable indent */
export default {
- serLazyImage: setLazyImage,
+ setLazyImage: setLazyImage,
fillImages: fillImages,
fillImage: fillImage,
lazyImage: lazyImage,
diff --git a/src/components/itemHelper.js b/src/components/itemHelper.js
index 55e9e10062..7d1ac0e110 100644
--- a/src/components/itemHelper.js
+++ b/src/components/itemHelper.js
@@ -1,342 +1,350 @@
-define(['apphost', 'globalize'], function (appHost, globalize) {
- 'use strict';
+import appHost from 'apphost';
+import globalize from 'globalize';
- function getDisplayName(item, options = {}) {
- if (!item) {
- throw new Error('null item passed into getDisplayName');
+export function getDisplayName(item, options = {}) {
+ if (!item) {
+ throw new Error('null item passed into getDisplayName');
+ }
+
+ if (item.Type === 'Timer') {
+ item = item.ProgramInfo || item;
+ }
+
+ let name = ((item.Type === 'Program' || item.Type === 'Recording') && (item.IsSeries || item.EpisodeTitle) ? item.EpisodeTitle : item.Name) || '';
+
+ if (item.Type === 'TvChannel') {
+ if (item.ChannelNumber) {
+ return item.ChannelNumber + ' ' + name;
}
-
- if (item.Type === 'Timer') {
- item = item.ProgramInfo || item;
- }
-
- var name = ((item.Type === 'Program' || item.Type === 'Recording') && (item.IsSeries || item.EpisodeTitle) ? item.EpisodeTitle : item.Name) || '';
-
- if (item.Type === 'TvChannel') {
- if (item.ChannelNumber) {
- return item.ChannelNumber + ' ' + name;
- }
- return name;
- }
- if (item.Type === 'Episode' && item.ParentIndexNumber === 0) {
- name = globalize.translate('ValueSpecialEpisodeName', name);
- } else if ((item.Type === 'Episode' || item.Type === 'Program') && item.IndexNumber != null && item.ParentIndexNumber != null && options.includeIndexNumber !== false) {
- var displayIndexNumber = item.IndexNumber;
-
- var number = displayIndexNumber;
- var nameSeparator = ' - ';
-
- if (options.includeParentInfo !== false) {
- number = 'S' + item.ParentIndexNumber + ':E' + number;
- } else {
- nameSeparator = '. ';
- }
-
- if (item.IndexNumberEnd) {
- displayIndexNumber = item.IndexNumberEnd;
- number += '-' + displayIndexNumber;
- }
-
- if (number) {
- name = name ? (number + nameSeparator + name) : number;
- }
- }
-
return name;
}
+ if (item.Type === 'Episode' && item.ParentIndexNumber === 0) {
+ name = globalize.translate('ValueSpecialEpisodeName', name);
+ } else if ((item.Type === 'Episode' || item.Type === 'Program') && item.IndexNumber != null && item.ParentIndexNumber != null && options.includeIndexNumber !== false) {
+ let displayIndexNumber = item.IndexNumber;
- function supportsAddingToCollection(item) {
- var invalidTypes = ['Genre', 'MusicGenre', 'Studio', 'UserView', 'CollectionFolder', 'Audio', 'Program', 'Timer', 'SeriesTimer'];
+ let number = displayIndexNumber;
+ let nameSeparator = ' - ';
- if (item.Type === 'Recording') {
- if (item.Status !== 'Completed') {
- return false;
- }
+ if (options.includeParentInfo !== false) {
+ number = 'S' + item.ParentIndexNumber + ':E' + number;
+ } else {
+ nameSeparator = '. ';
}
- return !item.CollectionType && invalidTypes.indexOf(item.Type) === -1 && item.MediaType !== 'Photo' && !isLocalItem(item);
+ if (item.IndexNumberEnd) {
+ displayIndexNumber = item.IndexNumberEnd;
+ number += '-' + displayIndexNumber;
+ }
+
+ if (number) {
+ name = name ? (number + nameSeparator + name) : number;
+ }
}
- function supportsAddingToPlaylist(item) {
- if (item.Type === 'Program') {
- return false;
- }
- if (item.Type === 'TvChannel') {
- return false;
- }
- if (item.Type === 'Timer') {
- return false;
- }
- if (item.Type === 'SeriesTimer') {
- return false;
- }
- if (item.MediaType === 'Photo') {
- return false;
- }
+ return name;
+}
- if (item.Type === 'Recording') {
- if (item.Status !== 'Completed') {
- return false;
- }
- }
+export function supportsAddingToCollection(item) {
+ const invalidTypes = ['Genre', 'MusicGenre', 'Studio', 'UserView', 'CollectionFolder', 'Audio', 'Program', 'Timer', 'SeriesTimer'];
- if (isLocalItem(item)) {
+ if (item.Type === 'Recording') {
+ if (item.Status !== 'Completed') {
return false;
}
- if (item.CollectionType === 'livetv') {
- return false;
- }
-
- return item.MediaType || item.IsFolder || item.Type === 'Genre' || item.Type === 'MusicGenre' || item.Type === 'MusicArtist';
}
- function canEdit(user, item) {
- var itemType = item.Type;
+ return !item.CollectionType && invalidTypes.indexOf(item.Type) === -1 && item.MediaType !== 'Photo' && !isLocalItem(item);
+}
- if (itemType === 'UserRootFolder' || itemType === 'UserView') {
- return false;
- }
-
- if (itemType === 'Program') {
- return false;
- }
-
- if (itemType === 'Timer') {
- return false;
- }
-
- if (itemType === 'SeriesTimer') {
- return false;
- }
-
- if (item.Type === 'Recording') {
- if (item.Status !== 'Completed') {
- return false;
- }
- }
-
- if (isLocalItem(item)) {
- return false;
- }
-
- return user.Policy.IsAdministrator;
+export function supportsAddingToPlaylist(item) {
+ if (item.Type === 'Program') {
+ return false;
+ }
+ if (item.Type === 'TvChannel') {
+ return false;
+ }
+ if (item.Type === 'Timer') {
+ return false;
+ }
+ if (item.Type === 'SeriesTimer') {
+ return false;
+ }
+ if (item.MediaType === 'Photo') {
+ return false;
}
- function isLocalItem(item) {
- if (item && item.Id && item.Id.indexOf('local') === 0) {
+ if (item.Type === 'Recording') {
+ if (item.Status !== 'Completed') {
+ return false;
+ }
+ }
+
+ if (isLocalItem(item)) {
+ return false;
+ }
+ if (item.CollectionType === 'livetv') {
+ return false;
+ }
+
+ return item.MediaType || item.IsFolder || item.Type === 'Genre' || item.Type === 'MusicGenre' || item.Type === 'MusicArtist';
+}
+
+export function canEdit(user, item) {
+ const itemType = item.Type;
+
+ if (itemType === 'UserRootFolder' || itemType === 'UserView') {
+ return false;
+ }
+
+ if (itemType === 'Program') {
+ return false;
+ }
+
+ if (itemType === 'Timer') {
+ return false;
+ }
+
+ if (itemType === 'SeriesTimer') {
+ return false;
+ }
+
+ if (item.Type === 'Recording') {
+ if (item.Status !== 'Completed') {
+ return false;
+ }
+ }
+
+ if (isLocalItem(item)) {
+ return false;
+ }
+
+ return user.Policy.IsAdministrator;
+}
+
+export function isLocalItem(item) {
+ if (item && item.Id && item.Id.indexOf('local') === 0) {
+ return true;
+ }
+
+ return false;
+}
+
+export function canIdentify (user, item) {
+ const itemType = item.Type;
+
+ if (itemType === 'Movie' ||
+ itemType === 'Trailer' ||
+ itemType === 'Series' ||
+ itemType === 'BoxSet' ||
+ itemType === 'Person' ||
+ itemType === 'Book' ||
+ itemType === 'MusicAlbum' ||
+ itemType === 'MusicArtist' ||
+ itemType === 'MusicVideo') {
+ if (user.Policy.IsAdministrator) {
+ if (!isLocalItem(item)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
+export function canEditImages (user, item) {
+ const itemType = item.Type;
+
+ if (item.MediaType === 'Photo') {
+ return false;
+ }
+
+ if (itemType === 'UserView') {
+ if (user.Policy.IsAdministrator) {
return true;
}
return false;
}
- return {
- getDisplayName: getDisplayName,
- supportsAddingToCollection: supportsAddingToCollection,
- supportsAddingToPlaylist: supportsAddingToPlaylist,
- isLocalItem: isLocalItem,
-
- canIdentify: function (user, item) {
- var itemType = item.Type;
-
- if (itemType === 'Movie' ||
- itemType === 'Trailer' ||
- itemType === 'Series' ||
- itemType === 'BoxSet' ||
- itemType === 'Person' ||
- itemType === 'Book' ||
- itemType === 'MusicAlbum' ||
- itemType === 'MusicArtist' ||
- itemType === 'MusicVideo') {
- if (user.Policy.IsAdministrator) {
- if (!isLocalItem(item)) {
- return true;
- }
- }
- }
-
+ if (item.Type === 'Recording') {
+ if (item.Status !== 'Completed') {
return false;
- },
+ }
+ }
- canEdit: canEdit,
+ return itemType !== 'Timer' && itemType !== 'SeriesTimer' && canEdit(user, item) && !isLocalItem(item);
+}
- canEditImages: function (user, item) {
- var itemType = item.Type;
+export function canSync (user, item) {
+ if (user && !user.Policy.EnableContentDownloading) {
+ return false;
+ }
- if (item.MediaType === 'Photo') {
- return false;
- }
+ if (isLocalItem(item)) {
+ return false;
+ }
- if (itemType === 'UserView') {
- if (user.Policy.IsAdministrator) {
- return true;
- }
-
- return false;
- }
-
- if (item.Type === 'Recording') {
- if (item.Status !== 'Completed') {
- return false;
- }
- }
-
- return itemType !== 'Timer' && itemType !== 'SeriesTimer' && canEdit(user, item) && !isLocalItem(item);
- },
-
- canSync: function (user, item) {
- if (user && !user.Policy.EnableContentDownloading) {
- return false;
- }
-
- if (isLocalItem(item)) {
- return false;
- }
-
- return item.SupportsSync;
- },
-
- canShare: function (item, user) {
- if (item.Type === 'Program') {
- return false;
- }
- if (item.Type === 'TvChannel') {
- return false;
- }
- if (item.Type === 'Timer') {
- return false;
- }
- if (item.Type === 'SeriesTimer') {
- return false;
- }
- if (item.Type === 'Recording') {
- if (item.Status !== 'Completed') {
- return false;
- }
- }
- if (isLocalItem(item)) {
- return false;
- }
- return user.Policy.EnablePublicSharing && appHost.supports('sharing');
- },
-
- enableDateAddedDisplay: function (item) {
- return !item.IsFolder && item.MediaType && item.Type !== 'Program' && item.Type !== 'TvChannel' && item.Type !== 'Trailer';
- },
-
- canMarkPlayed: function (item) {
- if (item.Type === 'Program') {
- return false;
- }
-
- if (item.MediaType === 'Video') {
- if (item.Type !== 'TvChannel') {
- return true;
- }
- } else if (item.MediaType === 'Audio') {
- if (item.Type === 'AudioPodcast') {
- return true;
- }
- if (item.Type === 'AudioBook') {
- return true;
- }
- }
-
- if (item.Type === 'Series' ||
- item.Type === 'Season' ||
- item.Type === 'BoxSet' ||
- item.MediaType === 'Book' ||
- item.MediaType === 'Recording') {
- return true;
- }
+ return item.SupportsSync;
+}
+export function canShare (item, user) {
+ if (item.Type === 'Program') {
+ return false;
+ }
+ if (item.Type === 'TvChannel') {
+ return false;
+ }
+ if (item.Type === 'Timer') {
+ return false;
+ }
+ if (item.Type === 'SeriesTimer') {
+ return false;
+ }
+ if (item.Type === 'Recording') {
+ if (item.Status !== 'Completed') {
return false;
- },
+ }
+ }
+ if (isLocalItem(item)) {
+ return false;
+ }
+ return user.Policy.EnablePublicSharing && appHost.supports('sharing');
+}
- canRate: function (item) {
- if (item.Type === 'Program'
- || item.Type === 'Timer'
- || item.Type === 'SeriesTimer'
- || item.Type === 'CollectionFolder'
- || item.Type === 'UserView'
- || item.Type === 'Channel'
- || !item.UserData) {
- return false;
- }
+export function enableDateAddedDisplay (item) {
+ return !item.IsFolder && item.MediaType && item.Type !== 'Program' && item.Type !== 'TvChannel' && item.Type !== 'Trailer';
+}
- return true;
- },
-
- canConvert: function (item, user) {
- if (!user.Policy.EnableMediaConversion) {
- return false;
- }
-
- if (isLocalItem(item)) {
- return false;
- }
-
- var mediaType = item.MediaType;
- if (mediaType === 'Book' || mediaType === 'Photo' || mediaType === 'Audio') {
- return false;
- }
-
- var collectionType = item.CollectionType;
- if (collectionType === 'livetv') {
- return false;
- }
-
- var type = item.Type;
- if (type === 'Channel' || type === 'Person' || type === 'Year' || type === 'Program' || type === 'Timer' || type === 'SeriesTimer') {
- return false;
- }
-
- if (item.LocationType === 'Virtual' && !item.IsFolder) {
- return false;
- }
-
- if (item.IsPlaceHolder) {
- return false;
- }
-
- return true;
- },
-
- canRefreshMetadata: function (item, user) {
- if (user.Policy.IsAdministrator) {
- var collectionType = item.CollectionType;
- if (collectionType === 'livetv') {
- return false;
- }
-
- if (item.Type !== 'Timer' && item.Type !== 'SeriesTimer' && item.Type !== 'Program' && item.Type !== 'TvChannel' && !(item.Type === 'Recording' && item.Status !== 'Completed')) {
- if (!isLocalItem(item)) {
- return true;
- }
- }
- }
-
- return false;
- },
-
- supportsMediaSourceSelection: function (item) {
- if (item.MediaType !== 'Video') {
- return false;
- }
- if (item.Type === 'TvChannel') {
- return false;
- }
- if (!item.MediaSources || (item.MediaSources.length === 1 && item.MediaSources[0].Type === 'Placeholder')) {
- return false;
- }
- if (item.EnableMediaSourceDisplay === false) {
- return false;
- }
- if (item.EnableMediaSourceDisplay == null && item.SourceType && item.SourceType !== 'Library') {
- return false;
- }
+export function canMarkPlayed (item) {
+ if (item.Type === 'Program') {
+ return false;
+ }
+ if (item.MediaType === 'Video') {
+ if (item.Type !== 'TvChannel') {
return true;
}
- };
-});
+ } else if (item.MediaType === 'Audio') {
+ if (item.Type === 'AudioPodcast') {
+ return true;
+ }
+ if (item.Type === 'AudioBook') {
+ return true;
+ }
+ }
+
+ if (item.Type === 'Series' ||
+ item.Type === 'Season' ||
+ item.Type === 'BoxSet' ||
+ item.MediaType === 'Book' ||
+ item.MediaType === 'Recording') {
+ return true;
+ }
+
+ return false;
+}
+
+export function canRate (item) {
+ if (item.Type === 'Program'
+ || item.Type === 'Timer'
+ || item.Type === 'SeriesTimer'
+ || item.Type === 'CollectionFolder'
+ || item.Type === 'UserView'
+ || item.Type === 'Channel'
+ || !item.UserData) {
+ return false;
+ }
+
+ return true;
+}
+
+export function canConvert (item, user) {
+ if (!user.Policy.EnableMediaConversion) {
+ return false;
+ }
+
+ if (isLocalItem(item)) {
+ return false;
+ }
+
+ const mediaType = item.MediaType;
+ if (mediaType === 'Book' || mediaType === 'Photo' || mediaType === 'Audio') {
+ return false;
+ }
+
+ const collectionType = item.CollectionType;
+ if (collectionType === 'livetv') {
+ return false;
+ }
+
+ const type = item.Type;
+ if (type === 'Channel' || type === 'Person' || type === 'Year' || type === 'Program' || type === 'Timer' || type === 'SeriesTimer') {
+ return false;
+ }
+
+ if (item.LocationType === 'Virtual' && !item.IsFolder) {
+ return false;
+ }
+
+ if (item.IsPlaceHolder) {
+ return false;
+ }
+
+ return true;
+}
+
+export function canRefreshMetadata (item, user) {
+ if (user.Policy.IsAdministrator) {
+ const collectionType = item.CollectionType;
+ if (collectionType === 'livetv') {
+ return false;
+ }
+
+ if (item.Type !== 'Timer' && item.Type !== 'SeriesTimer' && item.Type !== 'Program' && item.Type !== 'TvChannel' && !(item.Type === 'Recording' && item.Status !== 'Completed')) {
+ if (!isLocalItem(item)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
+export function supportsMediaSourceSelection (item) {
+ if (item.MediaType !== 'Video') {
+ return false;
+ }
+ if (item.Type === 'TvChannel') {
+ return false;
+ }
+ if (!item.MediaSources || (item.MediaSources.length === 1 && item.MediaSources[0].Type === 'Placeholder')) {
+ return false;
+ }
+ if (item.EnableMediaSourceDisplay === false) {
+ return false;
+ }
+ if (item.EnableMediaSourceDisplay == null && item.SourceType && item.SourceType !== 'Library') {
+ return false;
+ }
+
+ return true;
+}
+
+export default {
+ getDisplayName: getDisplayName,
+ supportsAddingToCollection: supportsAddingToCollection,
+ supportsAddingToPlaylist: supportsAddingToPlaylist,
+ isLocalItem: isLocalItem,
+ canIdentify: canIdentify,
+ canEdit: canEdit,
+ canEditImages: canEditImages,
+ canSync: canSync,
+ canShare: canShare,
+ enableDateAddedDisplay: enableDateAddedDisplay,
+ canMarkPlayed: canMarkPlayed,
+ canRate: canRate,
+ canConvert: canConvert,
+ canRefreshMetadata: canRefreshMetadata,
+ supportsMediaSourceSelection: supportsMediaSourceSelection
+};
diff --git a/src/components/itemsrefresher.js b/src/components/itemsrefresher.js
index a210af31af..74b08db07f 100644
--- a/src/components/itemsrefresher.js
+++ b/src/components/itemsrefresher.js
@@ -1,6 +1,8 @@
define(['playbackManager', 'serverNotifications', 'events'], function (playbackManager, serverNotifications, events) {
'use strict';
+ playbackManager = playbackManager.default || playbackManager;
+
function onUserDataChanged(e, apiClient, userData) {
var instance = this;
diff --git a/src/components/layoutManager.js b/src/components/layoutManager.js
index bec7d4ae3b..85d78f8ff4 100644
--- a/src/components/layoutManager.js
+++ b/src/components/layoutManager.js
@@ -1,6 +1,8 @@
define(['browser', 'appSettings', 'events'], function (browser, appSettings, events) {
'use strict';
+ browser = browser.default || browser;
+
function setLayout(instance, layout, selectedLayout) {
if (layout === selectedLayout) {
instance[layout] = true;
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js
index a6256de24c..ab193c264e 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.js
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.js
@@ -219,7 +219,7 @@ import 'emby-input';
html += '
';
html += '
' + globalize.translate('HeaderTypeImageFetchers', availableTypeOptions.Type) + '
';
const supportedImageTypes = availableTypeOptions.SupportedImageTypes || [];
- if (supportedImageTypes.length > 1 || 1 === supportedImageTypes.length && 'Primary' !== supportedImageTypes[0]) {
+ if (supportedImageTypes.length > 1 || supportedImageTypes.length === 1 && supportedImageTypes[0] !== 'Primary') {
html += '';
}
html += '';
@@ -362,7 +362,7 @@ import 'emby-input';
TypeOptions: []
};
currentAvailableOptions = null;
- const isNewLibrary = null === libraryOptions;
+ const isNewLibrary = libraryOptions === null;
isNewLibrary && parent.classList.add('newlibrary');
const response = await fetch('components/libraryoptionseditor/libraryoptionseditor.template.html');
const template = await response.text();
@@ -578,7 +578,7 @@ import 'emby-input';
parent.querySelector('#chkSkipIfAudioTrackPresent').checked = options.SkipSubtitlesIfAudioTrackMatches;
parent.querySelector('#chkRequirePerfectMatch').checked = options.RequirePerfectSubtitleMatch;
Array.prototype.forEach.call(parent.querySelectorAll('.chkMetadataSaver'), elem => {
- elem.checked = options.MetadataSavers ? options.MetadataSavers.includes(elem.getAttribute('data-pluginname')) : 'true' === elem.getAttribute('data-defaultenabled');
+ elem.checked = options.MetadataSavers ? options.MetadataSavers.includes(elem.getAttribute('data-pluginname')) : elem.getAttribute('data-defaultenabled') === 'true';
});
Array.prototype.forEach.call(parent.querySelectorAll('.chkSubtitleLanguage'), elem => {
elem.checked = !!options.SubtitleDownloadLanguages && options.SubtitleDownloadLanguages.includes(elem.getAttribute('data-lang'));
diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js
index 6b20159130..11e8e953ae 100644
--- a/src/components/listview/listview.js
+++ b/src/components/listview/listview.js
@@ -81,7 +81,7 @@ import 'emby-playstatebutton';
let itemId;
const options = {
- maxWidth: width * 2,
+ maxWidth: width,
type: 'Primary'
};
@@ -108,7 +108,7 @@ import 'emby-playstatebutton';
function getChannelImageUrl(item, width) {
const apiClient = connectionManager.getApiClient(item.ServerId);
const options = {
- maxWidth: width * 2,
+ maxWidth: width,
type: 'Primary'
};
diff --git a/src/components/loading/loading.js b/src/components/loading/loading.js
index 9f86ba452f..8237611373 100644
--- a/src/components/loading/loading.js
+++ b/src/components/loading/loading.js
@@ -1,78 +1,74 @@
-define(['css!./loading'], function () {
- 'use strict';
+import 'css!./loading';
- var loadingElem;
- var layer1;
- var layer2;
- var layer3;
- var layer4;
- var circleLefts;
- var circleRights;
+let loadingElem;
+let layer1;
+let layer2;
+let layer3;
+let layer4;
+let circleLefts;
+let circleRights;
- return {
- show: function () {
- var elem = loadingElem;
+export function show() {
+ let elem = loadingElem;
- if (!elem) {
- elem = document.createElement('div');
- loadingElem = elem;
+ if (!elem) {
+ elem = document.createElement('div');
+ loadingElem = elem;
- elem.classList.add('docspinner');
- elem.classList.add('mdl-spinner');
+ elem.classList.add('docspinner');
+ elem.classList.add('mdl-spinner');
- elem.innerHTML = '
';
+ elem.innerHTML = '
';
- document.body.appendChild(elem);
+ document.body.appendChild(elem);
- layer1 = elem.querySelector('.mdl-spinner__layer-1');
- layer2 = elem.querySelector('.mdl-spinner__layer-2');
- layer3 = elem.querySelector('.mdl-spinner__layer-3');
- layer4 = elem.querySelector('.mdl-spinner__layer-4');
+ layer1 = elem.querySelector('.mdl-spinner__layer-1');
+ layer2 = elem.querySelector('.mdl-spinner__layer-2');
+ layer3 = elem.querySelector('.mdl-spinner__layer-3');
+ layer4 = elem.querySelector('.mdl-spinner__layer-4');
- circleLefts = elem.querySelectorAll('.mdl-spinner__circleLeft');
- circleRights = elem.querySelectorAll('.mdl-spinner__circleRight');
- }
+ circleLefts = elem.querySelectorAll('.mdl-spinner__circleLeft');
+ circleRights = elem.querySelectorAll('.mdl-spinner__circleRight');
+ }
- elem.classList.add('mdlSpinnerActive');
+ elem.classList.add('mdlSpinnerActive');
- layer1.classList.add('mdl-spinner__layer-1-active');
- layer2.classList.add('mdl-spinner__layer-2-active');
- layer3.classList.add('mdl-spinner__layer-3-active');
- layer4.classList.add('mdl-spinner__layer-4-active');
+ layer1.classList.add('mdl-spinner__layer-1-active');
+ layer2.classList.add('mdl-spinner__layer-2-active');
+ layer3.classList.add('mdl-spinner__layer-3-active');
+ layer4.classList.add('mdl-spinner__layer-4-active');
- var i;
- var length;
+ for (let i = 0, length = circleLefts.length; i < length; i++) {
+ circleLefts[i].classList.add('mdl-spinner__circleLeft-active');
+ }
- for (i = 0, length = circleLefts.length; i < length; i++) {
- circleLefts[i].classList.add('mdl-spinner__circleLeft-active');
- }
+ for (let i = 0, length = circleRights.length; i < length; i++) {
+ circleRights[i].classList.add('mdl-spinner__circleRight-active');
+ }
+}
- for (i = 0, length = circleRights.length; i < length; i++) {
- circleRights[i].classList.add('mdl-spinner__circleRight-active');
- }
- },
- hide: function () {
- var elem = loadingElem;
+export function hide() {
+ const elem = loadingElem;
- if (elem) {
- elem.classList.remove('mdlSpinnerActive');
+ if (elem) {
+ elem.classList.remove('mdlSpinnerActive');
- elem.classList.remove('mdl-spinner__layer-1-active');
- elem.classList.remove('mdl-spinner__layer-2-active');
- elem.classList.remove('mdl-spinner__layer-3-active');
- elem.classList.remove('mdl-spinner__layer-4-active');
+ elem.classList.remove('mdl-spinner__layer-1-active');
+ elem.classList.remove('mdl-spinner__layer-2-active');
+ elem.classList.remove('mdl-spinner__layer-3-active');
+ elem.classList.remove('mdl-spinner__layer-4-active');
- var i;
- var length;
-
- for (i = 0, length = circleLefts.length; i < length; i++) {
- circleLefts[i].classList.remove('mdl-spinner__circleLeft-active');
- }
-
- for (i = 0, length = circleRights.length; i < length; i++) {
- circleRights[i].classList.remove('mdl-spinner__circleRight-active');
- }
- }
+ for (let i = 0, length = circleLefts.length; i < length; i++) {
+ circleLefts[i].classList.remove('mdl-spinner__circleLeft-active');
}
- };
-});
+
+ for (let i = 0, length = circleRights.length; i < length; i++) {
+ circleRights[i].classList.remove('mdl-spinner__circleRight-active');
+ }
+ }
+}
+
+export default {
+ show: show,
+ hide: hide
+};
diff --git a/src/components/mediaLibraryEditor/mediaLibraryEditor.js b/src/components/mediaLibraryEditor/mediaLibraryEditor.js
index 1cee6984d9..0e68c6a289 100644
--- a/src/components/mediaLibraryEditor/mediaLibraryEditor.js
+++ b/src/components/mediaLibraryEditor/mediaLibraryEditor.js
@@ -85,7 +85,7 @@ import 'flexStyles';
refreshLibraryFromServer(dom.parentWithClass(button, 'dlg-libraryeditor'));
}, () => {
import('toast').then(({default: toast}) => {
- toast(globalize.translate('DefaultErrorMessage'));
+ toast(globalize.translate('ErrorDefault'));
});
});
});
@@ -98,8 +98,8 @@ import 'flexStyles';
if (listItem) {
const index = parseInt(listItem.getAttribute('data-index'));
const pathInfos = (currentOptions.library.LibraryOptions || {}).PathInfos || [];
- const pathInfo = null == index ? {} : pathInfos[index] || {};
- const originalPath = pathInfo.Path || (null == index ? null : currentOptions.library.Locations[index]);
+ const pathInfo = index == null ? {} : pathInfos[index] || {};
+ const originalPath = pathInfo.Path || (index == null ? null : currentOptions.library.Locations[index]);
const btnRemovePath = dom.parentWithClass(e.target, 'btnRemovePath');
if (btnRemovePath) {
@@ -171,7 +171,7 @@ import 'flexStyles';
const picker = new directoryBrowser();
picker.show({
enableNetworkSharePath: true,
- pathReadOnly: null != originalPath,
+ pathReadOnly: originalPath != null,
path: originalPath,
networkSharePath: networkPath,
callback: function (path, networkSharePath) {
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index b4647bbf25..0bf270f2a1 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -1,6 +1,8 @@
define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'require'], function (serverNotifications, playbackManager, events, globalize, require) {
'use strict';
+ playbackManager = playbackManager.default || playbackManager;
+
function onOneDocumentClick() {
document.removeEventListener('click', onOneDocumentClick);
document.removeEventListener('keydown', onOneDocumentClick);
diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 829cd38f2c..437127be18 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -1,722 +1,738 @@
-define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'playQueueManager', 'userSettings', 'globalize', 'connectionManager', 'loading', 'apphost', 'screenfull'], function (events, datetime, appSettings, itemHelper, pluginManager, PlayQueueManager, userSettings, globalize, connectionManager, loading, apphost, screenfull) {
- 'use strict';
-
- function enableLocalPlaylistManagement(player) {
- if (player.getPlaylist) {
- return false;
- }
-
- if (player.isLocalPlayer) {
- return true;
- }
+import events from 'events';
+import datetime from 'datetime';
+import appSettings from 'appSettings';
+import itemHelper from 'itemHelper';
+import pluginManager from 'pluginManager';
+import PlayQueueManager from 'playQueueManager';
+import * as userSettings from 'userSettings';
+import globalize from 'globalize';
+import connectionManager from 'connectionManager';
+import loading from 'loading';
+import apphost from 'apphost';
+import screenfull from 'screenfull';
+function enableLocalPlaylistManagement(player) {
+ if (player.getPlaylist) {
return false;
}
- function bindToFullscreenChange(player) {
- if (screenfull.isEnabled) {
- screenfull.on('change', function () {
- events.trigger(player, 'fullscreenchange');
- });
- }
- }
-
- function triggerPlayerChange(playbackManagerInstance, newPlayer, newTarget, previousPlayer, previousTargetInfo) {
- if (!newPlayer && !previousPlayer) {
- return;
- }
-
- if (newTarget && previousTargetInfo) {
- if (newTarget.id === previousTargetInfo.id) {
- return;
- }
- }
-
- events.trigger(playbackManagerInstance, 'playerchange', [newPlayer, newTarget, previousPlayer]);
- }
-
- function reportPlayback(playbackManagerInstance, state, player, reportPlaylist, serverId, method, progressEventName) {
- if (!serverId) {
- // Not a server item
- // We can expand on this later and possibly report them
- events.trigger(playbackManagerInstance, 'reportplayback', [false]);
- return;
- }
-
- var info = Object.assign({}, state.PlayState);
- info.ItemId = state.NowPlayingItem.Id;
-
- if (progressEventName) {
- info.EventName = progressEventName;
- }
-
- if (reportPlaylist) {
- addPlaylistToPlaybackReport(playbackManagerInstance, info, player, serverId);
- }
-
- var apiClient = connectionManager.getApiClient(serverId);
- var reportPlaybackPromise = apiClient[method](info);
- // Notify that report has been sent
- reportPlaybackPromise.then(() => {
- events.trigger(playbackManagerInstance, 'reportplayback', [true]);
- });
- }
-
- function getPlaylistSync(playbackManagerInstance, player) {
- player = player || playbackManagerInstance._currentPlayer;
- if (player && !enableLocalPlaylistManagement(player)) {
- return player.getPlaylistSync();
- }
-
- return playbackManagerInstance._playQueueManager.getPlaylist();
- }
-
- function addPlaylistToPlaybackReport(playbackManagerInstance, info, player, serverId) {
- info.NowPlayingQueue = getPlaylistSync(playbackManagerInstance, player).map(function (i) {
- var itemInfo = {
- Id: i.Id,
- PlaylistItemId: i.PlaylistItemId
- };
-
- if (i.ServerId !== serverId) {
- itemInfo.ServerId = i.ServerId;
- }
-
- return itemInfo;
- });
- }
-
- function normalizeName(t) {
- return t.toLowerCase().replace(' ', '');
- }
-
- function getItemsForPlayback(serverId, query) {
- var apiClient = connectionManager.getApiClient(serverId);
-
- if (query.Ids && query.Ids.split(',').length === 1) {
- var itemId = query.Ids.split(',');
-
- return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
- return {
- Items: [item],
- TotalRecordCount: 1
- };
- });
- } else {
- query.Limit = query.Limit || 300;
- query.Fields = 'Chapters';
- query.ExcludeLocationTypes = 'Virtual';
- query.EnableTotalRecordCount = false;
- query.CollapseBoxSetItems = false;
-
- return apiClient.getItems(apiClient.getCurrentUserId(), query);
- }
- }
-
- function createStreamInfoFromUrlItem(item) {
- // Check item.Path for games
- return {
- url: item.Url || item.Path,
- playMethod: 'DirectPlay',
- item: item,
- textTracks: [],
- mediaType: item.MediaType
- };
- }
-
- function mergePlaybackQueries(obj1, obj2) {
- var query = Object.assign(obj1, obj2);
-
- var filters = query.Filters ? query.Filters.split(',') : [];
- if (filters.indexOf('IsNotFolder') === -1) {
- filters.push('IsNotFolder');
- }
- query.Filters = filters.join(',');
- return query;
- }
-
- function backdropImageUrl(apiClient, item, options) {
- options = options || {};
- options.type = options.type || 'Backdrop';
-
- // If not resizing, get the original image
- if (!options.maxWidth && !options.width && !options.maxHeight && !options.height) {
- options.quality = 100;
- }
-
- if (item.BackdropImageTags && item.BackdropImageTags.length) {
- options.tag = item.BackdropImageTags[0];
- return apiClient.getScaledImageUrl(item.Id, options);
- }
-
- if (item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
- options.tag = item.ParentBackdropImageTags[0];
- return apiClient.getScaledImageUrl(item.ParentBackdropItemId, options);
- }
-
- return null;
- }
-
- function getMimeType(type, container) {
- container = (container || '').toLowerCase();
-
- if (type === 'audio') {
- if (container === 'opus') {
- return 'audio/ogg';
- }
- if (container === 'webma') {
- return 'audio/webm';
- }
- if (container === 'm4a') {
- return 'audio/mp4';
- }
- } else if (type === 'video') {
- if (container === 'mkv') {
- return 'video/x-matroska';
- }
- if (container === 'm4v') {
- return 'video/mp4';
- }
- if (container === 'mov') {
- return 'video/quicktime';
- }
- if (container === 'mpg') {
- return 'video/mpeg';
- }
- if (container === 'flv') {
- return 'video/x-flv';
- }
- }
-
- return type + '/' + container;
- }
-
- function getParam(name, url) {
- name = name.replace(/[\[]/, '\\\[').replace(/[\]]/, '\\\]');
- var regexS = '[\\?&]' + name + '=([^&#]*)';
- var regex = new RegExp(regexS, 'i');
-
- var results = regex.exec(url);
- if (results == null) {
- return '';
- } else {
- return decodeURIComponent(results[1].replace(/\+/g, ' '));
- }
- }
-
- function isAutomaticPlayer(player) {
- if (player.isLocalPlayer) {
- return true;
- }
-
- return false;
- }
-
- function getAutomaticPlayers(instance, forceLocalPlayer) {
- if (!forceLocalPlayer) {
- var player = instance._currentPlayer;
- if (player && !isAutomaticPlayer(player)) {
- return [player];
- }
- }
-
- return instance.getPlayers().filter(isAutomaticPlayer);
- }
-
- function isServerItem(item) {
- if (!item.Id) {
- return false;
- }
+ if (player.isLocalPlayer) {
return true;
}
- function enableIntros(item) {
- if (item.MediaType !== 'Video') {
- return false;
- }
- if (item.Type === 'TvChannel') {
- return false;
- }
- // disable for in-progress recordings
- if (item.Status === 'InProgress') {
- return false;
- }
+ return false;
+}
- return isServerItem(item);
+function bindToFullscreenChange(player) {
+ if (screenfull.isEnabled) {
+ screenfull.on('change', function () {
+ events.trigger(player, 'fullscreenchange');
+ });
+ } else {
+ // iOS Safari
+ document.addEventListener('webkitfullscreenchange', function () {
+ events.trigger(player, 'fullscreenchange');
+ }, false);
+ }
+}
+
+function triggerPlayerChange(playbackManagerInstance, newPlayer, newTarget, previousPlayer, previousTargetInfo) {
+ if (!newPlayer && !previousPlayer) {
+ return;
}
- function getIntros(firstItem, apiClient, options) {
- if (options.startPositionTicks || options.startIndex || options.fullscreen === false || !enableIntros(firstItem) || !userSettings.enableCinemaMode()) {
- return Promise.resolve({
- Items: []
- });
+ if (newTarget && previousTargetInfo) {
+ if (newTarget.id === previousTargetInfo.id) {
+ return;
}
-
- return apiClient.getIntros(firstItem.Id).then(function (result) {
- return result;
- }, function (err) {
- return Promise.resolve({
- Items: []
- });
- });
}
- function getAudioMaxValues(deviceProfile) {
- // TODO - this could vary per codec and should be done on the server using the entire profile
- var maxAudioSampleRate = null;
- var maxAudioBitDepth = null;
- var maxAudioBitrate = null;
+ events.trigger(playbackManagerInstance, 'playerchange', [newPlayer, newTarget, previousPlayer]);
+}
- deviceProfile.CodecProfiles.map(function (codecProfile) {
- if (codecProfile.Type === 'Audio') {
- (codecProfile.Conditions || []).map(function (condition) {
- if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioBitDepth') {
- return maxAudioBitDepth = condition.Value;
- } else if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioSampleRate') {
- return maxAudioSampleRate = condition.Value;
- } else if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioBitrate') {
- return maxAudioBitrate = condition.Value;
- }
- });
- }
- });
+function reportPlayback(playbackManagerInstance, state, player, reportPlaylist, serverId, method, progressEventName) {
+ if (!serverId) {
+ // Not a server item
+ // We can expand on this later and possibly report them
+ events.trigger(playbackManagerInstance, 'reportplayback', [false]);
+ return;
+ }
- return {
- maxAudioSampleRate: maxAudioSampleRate,
- maxAudioBitDepth: maxAudioBitDepth,
- maxAudioBitrate: maxAudioBitrate
+ const info = Object.assign({}, state.PlayState);
+ info.ItemId = state.NowPlayingItem.Id;
+
+ if (progressEventName) {
+ info.EventName = progressEventName;
+ }
+
+ if (reportPlaylist) {
+ addPlaylistToPlaybackReport(playbackManagerInstance, info, player, serverId);
+ }
+
+ const apiClient = connectionManager.getApiClient(serverId);
+ const reportPlaybackPromise = apiClient[method](info);
+ // Notify that report has been sent
+ reportPlaybackPromise.then(() => {
+ events.trigger(playbackManagerInstance, 'reportplayback', [true]);
+ });
+}
+
+function getPlaylistSync(playbackManagerInstance, player) {
+ player = player || playbackManagerInstance._currentPlayer;
+ if (player && !enableLocalPlaylistManagement(player)) {
+ return player.getPlaylistSync();
+ }
+
+ return playbackManagerInstance._playQueueManager.getPlaylist();
+}
+
+function addPlaylistToPlaybackReport(playbackManagerInstance, info, player, serverId) {
+ info.NowPlayingQueue = getPlaylistSync(playbackManagerInstance, player).map(function (i) {
+ const itemInfo = {
+ Id: i.Id,
+ PlaylistItemId: i.PlaylistItemId
};
+
+ if (i.ServerId !== serverId) {
+ itemInfo.ServerId = i.ServerId;
+ }
+
+ return itemInfo;
+ });
+}
+
+function normalizeName(t) {
+ return t.toLowerCase().replace(' ', '');
+}
+
+function getItemsForPlayback(serverId, query) {
+ const apiClient = connectionManager.getApiClient(serverId);
+
+ if (query.Ids && query.Ids.split(',').length === 1) {
+ const itemId = query.Ids.split(',');
+
+ return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
+ return {
+ Items: [item],
+ TotalRecordCount: 1
+ };
+ });
+ } else {
+ query.Limit = query.Limit || 300;
+ query.Fields = 'Chapters';
+ query.ExcludeLocationTypes = 'Virtual';
+ query.EnableTotalRecordCount = false;
+ query.CollapseBoxSetItems = false;
+
+ return apiClient.getItems(apiClient.getCurrentUserId(), query);
+ }
+}
+
+function createStreamInfoFromUrlItem(item) {
+ // Check item.Path for games
+ return {
+ url: item.Url || item.Path,
+ playMethod: 'DirectPlay',
+ item: item,
+ textTracks: [],
+ mediaType: item.MediaType
+ };
+}
+
+function mergePlaybackQueries(obj1, obj2) {
+ const query = Object.assign(obj1, obj2);
+
+ const filters = query.Filters ? query.Filters.split(',') : [];
+ if (filters.indexOf('IsNotFolder') === -1) {
+ filters.push('IsNotFolder');
+ }
+ query.Filters = filters.join(',');
+ return query;
+}
+
+function backdropImageUrl(apiClient, item, options) {
+ options = options || {};
+ options.type = options.type || 'Backdrop';
+
+ // If not resizing, get the original image
+ if (!options.maxWidth && !options.width && !options.maxHeight && !options.height) {
+ options.quality = 100;
}
- var startingPlaySession = new Date().getTime();
- function getAudioStreamUrl(item, transcodingProfile, directPlayContainers, maxBitrate, apiClient, maxAudioSampleRate, maxAudioBitDepth, maxAudioBitrate, startPosition) {
- var url = 'Audio/' + item.Id + '/universal';
+ if (item.BackdropImageTags && item.BackdropImageTags.length) {
+ options.tag = item.BackdropImageTags[0];
+ return apiClient.getScaledImageUrl(item.Id, options);
+ }
- startingPlaySession++;
- return apiClient.getUrl(url, {
- UserId: apiClient.getCurrentUserId(),
- DeviceId: apiClient.deviceId(),
- MaxStreamingBitrate: maxAudioBitrate || maxBitrate,
- Container: directPlayContainers,
- TranscodingContainer: transcodingProfile.Container || null,
- TranscodingProtocol: transcodingProfile.Protocol || null,
- AudioCodec: transcodingProfile.AudioCodec,
- MaxAudioSampleRate: maxAudioSampleRate,
- MaxAudioBitDepth: maxAudioBitDepth,
- api_key: apiClient.accessToken(),
- PlaySessionId: startingPlaySession,
- StartTimeTicks: startPosition || 0,
- EnableRedirection: true,
- EnableRemoteMedia: apphost.supports('remoteaudio')
+ if (item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
+ options.tag = item.ParentBackdropImageTags[0];
+ return apiClient.getScaledImageUrl(item.ParentBackdropItemId, options);
+ }
+
+ return null;
+}
+
+function getMimeType(type, container) {
+ container = (container || '').toLowerCase();
+
+ if (type === 'audio') {
+ if (container === 'opus') {
+ return 'audio/ogg';
+ }
+ if (container === 'webma') {
+ return 'audio/webm';
+ }
+ if (container === 'm4a') {
+ return 'audio/mp4';
+ }
+ } else if (type === 'video') {
+ if (container === 'mkv') {
+ return 'video/x-matroska';
+ }
+ if (container === 'm4v') {
+ return 'video/mp4';
+ }
+ if (container === 'mov') {
+ return 'video/quicktime';
+ }
+ if (container === 'mpg') {
+ return 'video/mpeg';
+ }
+ if (container === 'flv') {
+ return 'video/x-flv';
+ }
+ }
+
+ return type + '/' + container;
+}
+
+function getParam(name, url) {
+ name = name.replace(/[\[]/, '\\\[').replace(/[\]]/, '\\\]');
+ const regexS = '[\\?&]' + name + '=([^&#]*)';
+ const regex = new RegExp(regexS, 'i');
+
+ const results = regex.exec(url);
+ if (results == null) {
+ return '';
+ } else {
+ return decodeURIComponent(results[1].replace(/\+/g, ' '));
+ }
+}
+
+function isAutomaticPlayer(player) {
+ if (player.isLocalPlayer) {
+ return true;
+ }
+
+ return false;
+}
+
+function getAutomaticPlayers(instance, forceLocalPlayer) {
+ if (!forceLocalPlayer) {
+ const player = instance._currentPlayer;
+ if (player && !isAutomaticPlayer(player)) {
+ return [player];
+ }
+ }
+
+ return instance.getPlayers().filter(isAutomaticPlayer);
+}
+
+function isServerItem(item) {
+ if (!item.Id) {
+ return false;
+ }
+ return true;
+}
+
+function enableIntros(item) {
+ if (item.MediaType !== 'Video') {
+ return false;
+ }
+ if (item.Type === 'TvChannel') {
+ return false;
+ }
+ // disable for in-progress recordings
+ if (item.Status === 'InProgress') {
+ return false;
+ }
+
+ return isServerItem(item);
+}
+
+function getIntros(firstItem, apiClient, options) {
+ if (options.startPositionTicks || options.startIndex || options.fullscreen === false || !enableIntros(firstItem) || !userSettings.enableCinemaMode()) {
+ return Promise.resolve({
+ Items: []
});
}
- function getAudioStreamUrlFromDeviceProfile(item, deviceProfile, maxBitrate, apiClient, startPosition) {
- var transcodingProfile = deviceProfile.TranscodingProfiles.filter(function (p) {
- return p.Type === 'Audio' && p.Context === 'Streaming';
+ return apiClient.getIntros(firstItem.Id).then(function (result) {
+ return result;
+ }, function (err) {
+ return Promise.resolve({
+ Items: []
+ });
+ });
+}
+
+function getAudioMaxValues(deviceProfile) {
+ // TODO - this could vary per codec and should be done on the server using the entire profile
+ let maxAudioSampleRate = null;
+ let maxAudioBitDepth = null;
+ let maxAudioBitrate = null;
+
+ deviceProfile.CodecProfiles.map(function (codecProfile) {
+ if (codecProfile.Type === 'Audio') {
+ (codecProfile.Conditions || []).map(function (condition) {
+ if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioBitDepth') {
+ return maxAudioBitDepth = condition.Value;
+ } else if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioSampleRate') {
+ return maxAudioSampleRate = condition.Value;
+ } else if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioBitrate') {
+ return maxAudioBitrate = condition.Value;
+ }
+ });
+ }
+ });
+
+ return {
+ maxAudioSampleRate: maxAudioSampleRate,
+ maxAudioBitDepth: maxAudioBitDepth,
+ maxAudioBitrate: maxAudioBitrate
+ };
+}
+
+let startingPlaySession = new Date().getTime();
+function getAudioStreamUrl(item, transcodingProfile, directPlayContainers, maxBitrate, apiClient, maxAudioSampleRate, maxAudioBitDepth, maxAudioBitrate, startPosition) {
+ const url = 'Audio/' + item.Id + '/universal';
+
+ startingPlaySession++;
+ return apiClient.getUrl(url, {
+ UserId: apiClient.getCurrentUserId(),
+ DeviceId: apiClient.deviceId(),
+ MaxStreamingBitrate: maxAudioBitrate || maxBitrate,
+ Container: directPlayContainers,
+ TranscodingContainer: transcodingProfile.Container || null,
+ TranscodingProtocol: transcodingProfile.Protocol || null,
+ AudioCodec: transcodingProfile.AudioCodec,
+ MaxAudioSampleRate: maxAudioSampleRate,
+ MaxAudioBitDepth: maxAudioBitDepth,
+ api_key: apiClient.accessToken(),
+ PlaySessionId: startingPlaySession,
+ StartTimeTicks: startPosition || 0,
+ EnableRedirection: true,
+ EnableRemoteMedia: apphost.supports('remoteaudio')
+ });
+}
+
+function getAudioStreamUrlFromDeviceProfile(item, deviceProfile, maxBitrate, apiClient, startPosition) {
+ const transcodingProfile = deviceProfile.TranscodingProfiles.filter(function (p) {
+ return p.Type === 'Audio' && p.Context === 'Streaming';
+ })[0];
+
+ let directPlayContainers = '';
+
+ deviceProfile.DirectPlayProfiles.map(function (p) {
+ if (p.Type === 'Audio') {
+ if (directPlayContainers) {
+ directPlayContainers += ',' + p.Container;
+ } else {
+ directPlayContainers = p.Container;
+ }
+
+ if (p.AudioCodec) {
+ directPlayContainers += '|' + p.AudioCodec;
+ }
+ }
+ });
+
+ const maxValues = getAudioMaxValues(deviceProfile);
+
+ return getAudioStreamUrl(item, transcodingProfile, directPlayContainers, maxBitrate, apiClient, maxValues.maxAudioSampleRate, maxValues.maxAudioBitDepth, maxValues.maxAudioBitrate, startPosition);
+}
+
+function getStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPosition) {
+ const audioTranscodingProfile = deviceProfile.TranscodingProfiles.filter(function (p) {
+ return p.Type === 'Audio' && p.Context === 'Streaming';
+ })[0];
+
+ let audioDirectPlayContainers = '';
+
+ deviceProfile.DirectPlayProfiles.map(function (p) {
+ if (p.Type === 'Audio') {
+ if (audioDirectPlayContainers) {
+ audioDirectPlayContainers += ',' + p.Container;
+ } else {
+ audioDirectPlayContainers = p.Container;
+ }
+
+ if (p.AudioCodec) {
+ audioDirectPlayContainers += '|' + p.AudioCodec;
+ }
+ }
+ });
+
+ const maxValues = getAudioMaxValues(deviceProfile);
+
+ const streamUrls = [];
+
+ for (let i = 0, length = items.length; i < length; i++) {
+ const item = items[i];
+ let streamUrl;
+
+ if (item.MediaType === 'Audio' && !itemHelper.isLocalItem(item)) {
+ streamUrl = getAudioStreamUrl(item, audioTranscodingProfile, audioDirectPlayContainers, maxBitrate, apiClient, maxValues.maxAudioSampleRate, maxValues.maxAudioBitDepth, maxValues.maxAudioBitrate, startPosition);
+ }
+
+ streamUrls.push(streamUrl || '');
+
+ if (i === 0) {
+ startPosition = 0;
+ }
+ }
+
+ return Promise.resolve(streamUrls);
+}
+
+function setStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPosition) {
+ return getStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPosition).then(function (streamUrls) {
+ for (let i = 0, length = items.length; i < length; i++) {
+ const item = items[i];
+ const streamUrl = streamUrls[i];
+
+ if (streamUrl) {
+ item.PresetMediaSource = {
+ StreamUrl: streamUrl,
+ Id: item.Id,
+ MediaStreams: [],
+ RunTimeTicks: item.RunTimeTicks
+ };
+ }
+ }
+ });
+}
+
+function getPlaybackInfo(player,
+ apiClient,
+ item,
+ deviceProfile,
+ maxBitrate,
+ startPosition,
+ isPlayback,
+ mediaSourceId,
+ audioStreamIndex,
+ subtitleStreamIndex,
+ liveStreamId,
+ enableDirectPlay,
+ enableDirectStream,
+ allowVideoStreamCopy,
+ allowAudioStreamCopy) {
+ if (!itemHelper.isLocalItem(item) && item.MediaType === 'Audio') {
+ return Promise.resolve({
+ MediaSources: [
+ {
+ StreamUrl: getAudioStreamUrlFromDeviceProfile(item, deviceProfile, maxBitrate, apiClient, startPosition),
+ Id: item.Id,
+ MediaStreams: [],
+ RunTimeTicks: item.RunTimeTicks
+ }]
+ });
+ }
+
+ if (item.PresetMediaSource) {
+ return Promise.resolve({
+ MediaSources: [item.PresetMediaSource]
+ });
+ }
+
+ const itemId = item.Id;
+
+ const query = {
+ UserId: apiClient.getCurrentUserId(),
+ StartTimeTicks: startPosition || 0
+ };
+
+ if (isPlayback) {
+ query.IsPlayback = true;
+ query.AutoOpenLiveStream = true;
+ } else {
+ query.IsPlayback = false;
+ query.AutoOpenLiveStream = false;
+ }
+
+ if (audioStreamIndex != null) {
+ query.AudioStreamIndex = audioStreamIndex;
+ }
+ if (subtitleStreamIndex != null) {
+ query.SubtitleStreamIndex = subtitleStreamIndex;
+ }
+ if (enableDirectPlay != null) {
+ query.EnableDirectPlay = enableDirectPlay;
+ }
+
+ if (enableDirectStream != null) {
+ query.EnableDirectStream = enableDirectStream;
+ }
+ if (allowVideoStreamCopy != null) {
+ query.AllowVideoStreamCopy = allowVideoStreamCopy;
+ }
+ if (allowAudioStreamCopy != null) {
+ query.AllowAudioStreamCopy = allowAudioStreamCopy;
+ }
+ if (mediaSourceId) {
+ query.MediaSourceId = mediaSourceId;
+ }
+ if (liveStreamId) {
+ query.LiveStreamId = liveStreamId;
+ }
+ if (maxBitrate) {
+ query.MaxStreamingBitrate = maxBitrate;
+ }
+ if (player.enableMediaProbe && !player.enableMediaProbe(item)) {
+ query.EnableMediaProbe = false;
+ }
+
+ // lastly, enforce player overrides for special situations
+ if (query.EnableDirectStream !== false) {
+ if (player.supportsPlayMethod && !player.supportsPlayMethod('DirectStream', item)) {
+ query.EnableDirectStream = false;
+ }
+ }
+
+ if (player.getDirectPlayProtocols) {
+ query.DirectPlayProtocols = player.getDirectPlayProtocols();
+ }
+
+ return apiClient.getPlaybackInfo(itemId, query, deviceProfile);
+}
+
+function getOptimalMediaSource(apiClient, item, versions) {
+ const promises = versions.map(function (v) {
+ return supportsDirectPlay(apiClient, item, v);
+ });
+
+ if (!promises.length) {
+ return Promise.reject();
+ }
+
+ return Promise.all(promises).then(function (results) {
+ for (let i = 0, length = versions.length; i < length; i++) {
+ versions[i].enableDirectPlay = results[i] || false;
+ }
+ let optimalVersion = versions.filter(function (v) {
+ return v.enableDirectPlay;
})[0];
- var directPlayContainers = '';
+ if (!optimalVersion) {
+ optimalVersion = versions.filter(function (v) {
+ return v.SupportsDirectStream;
+ })[0];
+ }
- deviceProfile.DirectPlayProfiles.map(function (p) {
- if (p.Type === 'Audio') {
- if (directPlayContainers) {
- directPlayContainers += ',' + p.Container;
- } else {
- directPlayContainers = p.Container;
- }
-
- if (p.AudioCodec) {
- directPlayContainers += '|' + p.AudioCodec;
- }
- }
- });
-
- var maxValues = getAudioMaxValues(deviceProfile);
-
- return getAudioStreamUrl(item, transcodingProfile, directPlayContainers, maxBitrate, apiClient, maxValues.maxAudioSampleRate, maxValues.maxAudioBitDepth, maxValues.maxAudioBitrate, startPosition);
- }
-
- function getStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPosition) {
- var audioTranscodingProfile = deviceProfile.TranscodingProfiles.filter(function (p) {
- return p.Type === 'Audio' && p.Context === 'Streaming';
+ optimalVersion = optimalVersion || versions.filter(function (s) {
+ return s.SupportsTranscoding;
})[0];
- var audioDirectPlayContainers = '';
+ return optimalVersion || versions[0];
+ });
+}
- deviceProfile.DirectPlayProfiles.map(function (p) {
- if (p.Type === 'Audio') {
- if (audioDirectPlayContainers) {
- audioDirectPlayContainers += ',' + p.Container;
- } else {
- audioDirectPlayContainers = p.Container;
- }
+function getLiveStream(player, apiClient, item, playSessionId, deviceProfile, maxBitrate, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex) {
+ const postData = {
+ DeviceProfile: deviceProfile,
+ OpenToken: mediaSource.OpenToken
+ };
- if (p.AudioCodec) {
- audioDirectPlayContainers += '|' + p.AudioCodec;
+ const query = {
+ UserId: apiClient.getCurrentUserId(),
+ StartTimeTicks: startPosition || 0,
+ ItemId: item.Id,
+ PlaySessionId: playSessionId
+ };
+
+ if (maxBitrate) {
+ query.MaxStreamingBitrate = maxBitrate;
+ }
+ if (audioStreamIndex != null) {
+ query.AudioStreamIndex = audioStreamIndex;
+ }
+ if (subtitleStreamIndex != null) {
+ query.SubtitleStreamIndex = subtitleStreamIndex;
+ }
+
+ // lastly, enforce player overrides for special situations
+ if (query.EnableDirectStream !== false) {
+ if (player.supportsPlayMethod && !player.supportsPlayMethod('DirectStream', item)) {
+ query.EnableDirectStream = false;
+ }
+ }
+
+ return apiClient.ajax({
+ url: apiClient.getUrl('LiveStreams/Open', query),
+ type: 'POST',
+ data: JSON.stringify(postData),
+ contentType: 'application/json',
+ dataType: 'json'
+
+ });
+}
+
+function isHostReachable(mediaSource, apiClient) {
+ if (mediaSource.IsRemote) {
+ return Promise.resolve(true);
+ }
+
+ return apiClient.getEndpointInfo().then(function (endpointInfo) {
+ if (endpointInfo.IsInNetwork) {
+ if (!endpointInfo.IsLocal) {
+ const path = (mediaSource.Path || '').toLowerCase();
+ if (path.indexOf('localhost') !== -1 || path.indexOf('127.0.0.1') !== -1) {
+ // This will only work if the app is on the same machine as the server
+ return Promise.resolve(false);
}
}
- });
- var maxValues = getAudioMaxValues(deviceProfile);
-
- var streamUrls = [];
-
- for (var i = 0, length = items.length; i < length; i++) {
- var item = items[i];
- var streamUrl;
-
- if (item.MediaType === 'Audio' && !itemHelper.isLocalItem(item)) {
- streamUrl = getAudioStreamUrl(item, audioTranscodingProfile, audioDirectPlayContainers, maxBitrate, apiClient, maxValues.maxAudioSampleRate, maxValues.maxAudioBitDepth, maxValues.maxAudioBitrate, startPosition);
- }
-
- streamUrls.push(streamUrl || '');
-
- if (i === 0) {
- startPosition = 0;
- }
- }
-
- return Promise.resolve(streamUrls);
- }
-
- function setStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPosition) {
- return getStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPosition).then(function (streamUrls) {
- for (var i = 0, length = items.length; i < length; i++) {
- var item = items[i];
- var streamUrl = streamUrls[i];
-
- if (streamUrl) {
- item.PresetMediaSource = {
- StreamUrl: streamUrl,
- Id: item.Id,
- MediaStreams: [],
- RunTimeTicks: item.RunTimeTicks
- };
- }
- }
- });
- }
-
- function getPlaybackInfo(player,
- apiClient,
- item,
- deviceProfile,
- maxBitrate,
- startPosition,
- isPlayback,
- mediaSourceId,
- audioStreamIndex,
- subtitleStreamIndex,
- liveStreamId,
- enableDirectPlay,
- enableDirectStream,
- allowVideoStreamCopy,
- allowAudioStreamCopy) {
- if (!itemHelper.isLocalItem(item) && item.MediaType === 'Audio') {
- return Promise.resolve({
- MediaSources: [
- {
- StreamUrl: getAudioStreamUrlFromDeviceProfile(item, deviceProfile, maxBitrate, apiClient, startPosition),
- Id: item.Id,
- MediaStreams: [],
- RunTimeTicks: item.RunTimeTicks
- }]
- });
- }
-
- if (item.PresetMediaSource) {
- return Promise.resolve({
- MediaSources: [item.PresetMediaSource]
- });
- }
-
- var itemId = item.Id;
-
- var query = {
- UserId: apiClient.getCurrentUserId(),
- StartTimeTicks: startPosition || 0
- };
-
- if (isPlayback) {
- query.IsPlayback = true;
- query.AutoOpenLiveStream = true;
- } else {
- query.IsPlayback = false;
- query.AutoOpenLiveStream = false;
- }
-
- if (audioStreamIndex != null) {
- query.AudioStreamIndex = audioStreamIndex;
- }
- if (subtitleStreamIndex != null) {
- query.SubtitleStreamIndex = subtitleStreamIndex;
- }
- if (enableDirectPlay != null) {
- query.EnableDirectPlay = enableDirectPlay;
- }
-
- if (enableDirectStream != null) {
- query.EnableDirectStream = enableDirectStream;
- }
- if (allowVideoStreamCopy != null) {
- query.AllowVideoStreamCopy = allowVideoStreamCopy;
- }
- if (allowAudioStreamCopy != null) {
- query.AllowAudioStreamCopy = allowAudioStreamCopy;
- }
- if (mediaSourceId) {
- query.MediaSourceId = mediaSourceId;
- }
- if (liveStreamId) {
- query.LiveStreamId = liveStreamId;
- }
- if (maxBitrate) {
- query.MaxStreamingBitrate = maxBitrate;
- }
- if (player.enableMediaProbe && !player.enableMediaProbe(item)) {
- query.EnableMediaProbe = false;
- }
-
- // lastly, enforce player overrides for special situations
- if (query.EnableDirectStream !== false) {
- if (player.supportsPlayMethod && !player.supportsPlayMethod('DirectStream', item)) {
- query.EnableDirectStream = false;
- }
- }
-
- if (player.getDirectPlayProtocols) {
- query.DirectPlayProtocols = player.getDirectPlayProtocols();
- }
-
- return apiClient.getPlaybackInfo(itemId, query, deviceProfile);
- }
-
- function getOptimalMediaSource(apiClient, item, versions) {
- var promises = versions.map(function (v) {
- return supportsDirectPlay(apiClient, item, v);
- });
-
- if (!promises.length) {
- return Promise.reject();
- }
-
- return Promise.all(promises).then(function (results) {
- for (var i = 0, length = versions.length; i < length; i++) {
- versions[i].enableDirectPlay = results[i] || false;
- }
- var optimalVersion = versions.filter(function (v) {
- return v.enableDirectPlay;
- })[0];
-
- if (!optimalVersion) {
- optimalVersion = versions.filter(function (v) {
- return v.SupportsDirectStream;
- })[0];
- }
-
- optimalVersion = optimalVersion || versions.filter(function (s) {
- return s.SupportsTranscoding;
- })[0];
-
- return optimalVersion || versions[0];
- });
- }
-
- function getLiveStream(player, apiClient, item, playSessionId, deviceProfile, maxBitrate, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex) {
- var postData = {
- DeviceProfile: deviceProfile,
- OpenToken: mediaSource.OpenToken
- };
-
- var query = {
- UserId: apiClient.getCurrentUserId(),
- StartTimeTicks: startPosition || 0,
- ItemId: item.Id,
- PlaySessionId: playSessionId
- };
-
- if (maxBitrate) {
- query.MaxStreamingBitrate = maxBitrate;
- }
- if (audioStreamIndex != null) {
- query.AudioStreamIndex = audioStreamIndex;
- }
- if (subtitleStreamIndex != null) {
- query.SubtitleStreamIndex = subtitleStreamIndex;
- }
-
- // lastly, enforce player overrides for special situations
- if (query.EnableDirectStream !== false) {
- if (player.supportsPlayMethod && !player.supportsPlayMethod('DirectStream', item)) {
- query.EnableDirectStream = false;
- }
- }
-
- return apiClient.ajax({
- url: apiClient.getUrl('LiveStreams/Open', query),
- type: 'POST',
- data: JSON.stringify(postData),
- contentType: 'application/json',
- dataType: 'json'
-
- });
- }
-
- function isHostReachable(mediaSource, apiClient) {
- if (mediaSource.IsRemote) {
return Promise.resolve(true);
}
- return apiClient.getEndpointInfo().then(function (endpointInfo) {
- if (endpointInfo.IsInNetwork) {
- if (!endpointInfo.IsLocal) {
- var path = (mediaSource.Path || '').toLowerCase();
- if (path.indexOf('localhost') !== -1 || path.indexOf('127.0.0.1') !== -1) {
- // This will only work if the app is on the same machine as the server
- return Promise.resolve(false);
- }
- }
+ // media source is in network, but connection is out of network
+ return Promise.resolve(false);
+ });
+}
- return Promise.resolve(true);
- }
+function supportsDirectPlay(apiClient, item, mediaSource) {
+ // folder rip hacks due to not yet being supported by the stream building engine
+ const isFolderRip = mediaSource.VideoType === 'BluRay' || mediaSource.VideoType === 'Dvd' || mediaSource.VideoType === 'HdDvd';
- // media source is in network, but connection is out of network
+ if (mediaSource.SupportsDirectPlay || isFolderRip) {
+ if (mediaSource.IsRemote && !apphost.supports('remotevideo')) {
return Promise.resolve(false);
- });
- }
+ }
- function supportsDirectPlay(apiClient, item, mediaSource) {
- // folder rip hacks due to not yet being supported by the stream building engine
- var isFolderRip = mediaSource.VideoType === 'BluRay' || mediaSource.VideoType === 'Dvd' || mediaSource.VideoType === 'HdDvd';
-
- if (mediaSource.SupportsDirectPlay || isFolderRip) {
- if (mediaSource.IsRemote && !apphost.supports('remotevideo')) {
- return Promise.resolve(false);
+ if (mediaSource.Protocol === 'Http' && !mediaSource.RequiredHttpHeaders.length) {
+ // If this is the only way it can be played, then allow it
+ if (!mediaSource.SupportsDirectStream && !mediaSource.SupportsTranscoding) {
+ return Promise.resolve(true);
+ } else {
+ return isHostReachable(mediaSource, apiClient);
}
+ } else if (mediaSource.Protocol === 'File') {
+ return new Promise(function (resolve, reject) {
+ // Determine if the file can be accessed directly
+ import('filesystem').then((filesystem) => {
+ const method = isFolderRip ?
+ 'directoryExists' :
+ 'fileExists';
- if (mediaSource.Protocol === 'Http' && !mediaSource.RequiredHttpHeaders.length) {
- // If this is the only way it can be played, then allow it
- if (!mediaSource.SupportsDirectStream && !mediaSource.SupportsTranscoding) {
- return Promise.resolve(true);
- } else {
- return isHostReachable(mediaSource, apiClient);
- }
- } else if (mediaSource.Protocol === 'File') {
- return new Promise(function (resolve, reject) {
- // Determine if the file can be accessed directly
- require(['filesystem'], function (filesystem) {
- var method = isFolderRip ?
- 'directoryExists' :
- 'fileExists';
-
- filesystem[method](mediaSource.Path).then(function () {
- resolve(true);
- }, function () {
- resolve(false);
- });
+ filesystem[method](mediaSource.Path).then(function () {
+ resolve(true);
+ }, function () {
+ resolve(false);
});
});
- }
- }
-
- return Promise.resolve(false);
- }
-
- function validatePlaybackInfoResult(instance, result) {
- if (result.ErrorCode) {
- showPlaybackInfoErrorMessage(instance, result.ErrorCode);
- return false;
- }
-
- return true;
- }
-
- function showPlaybackInfoErrorMessage(instance, errorCode, playNextTrack) {
- require(['alert'], function (alert) {
- alert.default({
- text: globalize.translate('PlaybackError' + errorCode),
- title: globalize.translate('HeaderPlaybackError')
- }).then(function () {
- if (playNextTrack) {
- instance.nextTrack();
- }
});
+ }
+ }
+
+ return Promise.resolve(false);
+}
+
+function validatePlaybackInfoResult(instance, result) {
+ if (result.ErrorCode) {
+ showPlaybackInfoErrorMessage(instance, result.ErrorCode);
+ return false;
+ }
+
+ return true;
+}
+
+function showPlaybackInfoErrorMessage(instance, errorCode, playNextTrack) {
+ import('alert').then(({ default: alert }) => {
+ alert({
+ text: globalize.translate('PlaybackError' + errorCode),
+ title: globalize.translate('HeaderPlaybackError')
+ }).then(function () {
+ if (playNextTrack) {
+ instance.nextTrack();
+ }
});
+ });
+}
+
+function normalizePlayOptions(playOptions) {
+ playOptions.fullscreen = playOptions.fullscreen !== false;
+}
+
+function truncatePlayOptions(playOptions) {
+ return {
+ fullscreen: playOptions.fullscreen,
+ mediaSourceId: playOptions.mediaSourceId,
+ audioStreamIndex: playOptions.audioStreamIndex,
+ subtitleStreamIndex: playOptions.subtitleStreamIndex,
+ startPositionTicks: playOptions.startPositionTicks
+ };
+}
+
+function getNowPlayingItemForReporting(player, item, mediaSource) {
+ const nowPlayingItem = Object.assign({}, item);
+
+ if (mediaSource) {
+ nowPlayingItem.RunTimeTicks = mediaSource.RunTimeTicks;
+ nowPlayingItem.MediaStreams = mediaSource.MediaStreams;
+
+ // not needed
+ nowPlayingItem.MediaSources = null;
}
- function normalizePlayOptions(playOptions) {
- playOptions.fullscreen = playOptions.fullscreen !== false;
+ nowPlayingItem.RunTimeTicks = nowPlayingItem.RunTimeTicks || player.duration() * 10000;
+
+ return nowPlayingItem;
+}
+
+function displayPlayerIndividually(player) {
+ return !player.isLocalPlayer;
+}
+
+function createTarget(instance, player) {
+ return {
+ name: player.name,
+ id: player.id,
+ playerName: player.name,
+ playableMediaTypes: ['Audio', 'Video', 'Photo', 'Book'].map(player.canPlayMediaType),
+ isLocalPlayer: player.isLocalPlayer,
+ supportedCommands: instance.getSupportedCommands(player)
+ };
+}
+
+function getPlayerTargets(player) {
+ if (player.getTargets) {
+ return player.getTargets();
}
- function truncatePlayOptions(playOptions) {
- return {
- fullscreen: playOptions.fullscreen,
- mediaSourceId: playOptions.mediaSourceId,
- audioStreamIndex: playOptions.audioStreamIndex,
- subtitleStreamIndex: playOptions.subtitleStreamIndex,
- startPositionTicks: playOptions.startPositionTicks
- };
- }
+ return Promise.resolve([createTarget(player)]);
+}
- function getNowPlayingItemForReporting(player, item, mediaSource) {
- var nowPlayingItem = Object.assign({}, item);
+function sortPlayerTargets(a, b) {
+ let aVal = a.isLocalPlayer ? 0 : 1;
+ let bVal = b.isLocalPlayer ? 0 : 1;
- if (mediaSource) {
- nowPlayingItem.RunTimeTicks = mediaSource.RunTimeTicks;
- nowPlayingItem.MediaStreams = mediaSource.MediaStreams;
+ aVal = aVal.toString() + a.name;
+ bVal = bVal.toString() + b.name;
- // not needed
- nowPlayingItem.MediaSources = null;
- }
+ return aVal.localeCompare(bVal);
+}
- nowPlayingItem.RunTimeTicks = nowPlayingItem.RunTimeTicks || player.duration() * 10000;
+class PlaybackManager {
+ constructor() {
+ const self = this;
- return nowPlayingItem;
- }
-
- function displayPlayerIndividually(player) {
- return !player.isLocalPlayer;
- }
-
- function createTarget(instance, player) {
- return {
- name: player.name,
- id: player.id,
- playerName: player.name,
- playableMediaTypes: ['Audio', 'Video', 'Photo', 'Book'].map(player.canPlayMediaType),
- isLocalPlayer: player.isLocalPlayer,
- supportedCommands: instance.getSupportedCommands(player)
- };
- }
-
- function getPlayerTargets(player) {
- if (player.getTargets) {
- return player.getTargets();
- }
-
- return Promise.resolve([createTarget(player)]);
- }
-
- function sortPlayerTargets(a, b) {
- var aVal = a.isLocalPlayer ? 0 : 1;
- var bVal = b.isLocalPlayer ? 0 : 1;
-
- aVal = aVal.toString() + a.name;
- bVal = bVal.toString() + b.name;
-
- return aVal.localeCompare(bVal);
- }
-
- function PlaybackManager() {
- var self = this;
-
- var players = [];
- var currentTargetInfo;
- var currentPairingId = null;
+ const players = [];
+ let currentTargetInfo;
+ let currentPairingId = null;
this._playNextAfterEnded = true;
- var playerStates = {};
+ const playerStates = {};
this._playQueueManager = new PlayQueueManager();
@@ -729,7 +745,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.currentItem();
}
- var data = getPlayerData(player);
+ const data = getPlayerData(player);
return data.streamInfo ? data.streamInfo.item : null;
};
@@ -742,7 +758,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.currentMediaSource();
}
- var data = getPlayerData(player);
+ const data = getPlayerData(player);
return data.streamInfo ? data.streamInfo.mediaSource : null;
};
@@ -755,7 +771,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.playMethod();
}
- var data = getPlayerData(player);
+ const data = getPlayerData(player);
return data.streamInfo ? data.streamInfo.playMethod : null;
};
@@ -768,21 +784,20 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.playSessionId();
}
- var data = getPlayerData(player);
+ const data = getPlayerData(player);
return data.streamInfo ? data.streamInfo.playSessionId : null;
};
self.getPlayerInfo = function () {
- var player = self._currentPlayer;
+ const player = self._currentPlayer;
if (!player) {
return null;
}
- var target = currentTargetInfo || {};
+ const target = currentTargetInfo || {};
return {
-
name: player.name,
isLocalPlayer: player.isLocalPlayer,
id: target.id,
@@ -838,7 +853,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
currentPairingId = targetInfo.id;
- var promise = player.tryPair ?
+ const promise = player.tryPair ?
player.tryPair(targetInfo) :
Promise.resolve();
@@ -856,11 +871,11 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
};
self.getTargets = function () {
- var promises = players.filter(displayPlayerIndividually).map(getPlayerTargets);
+ const promises = players.filter(displayPlayerIndividually).map(getPlayerTargets);
return Promise.all(promises).then(function (responses) {
return connectionManager.currentApiClient().getCurrentUser().then(function (user) {
- var targets = [];
+ const targets = [];
targets.push({
name: globalize.translate('HeaderMyDevice'),
@@ -874,17 +889,15 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
user: user
});
- for (var i = 0; i < responses.length; i++) {
- var subTargets = responses[i];
+ for (let i = 0; i < responses.length; i++) {
+ const subTargets = responses[i];
- for (var j = 0; j < subTargets.length; j++) {
+ for (let j = 0; j < subTargets.length; j++) {
targets.push(subTargets[j]);
}
}
- targets = targets.sort(sortPlayerTargets);
-
- return targets;
+ return targets.sort(sortPlayerTargets);
});
});
};
@@ -894,7 +907,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
throw new Error('player cannot be null');
}
- var index = getPlayerData(player).subtitleStreamIndex;
+ const index = getPlayerData(player).subtitleStreamIndex;
if (index == null || index === -1) {
return null;
@@ -923,7 +936,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
};
function removeCurrentPlayer(player) {
- var previousPlayer = self._currentPlayer;
+ const previousPlayer = self._currentPlayer;
if (!previousPlayer || player.id === previousPlayer.id) {
setCurrentPlayerInternal(null);
@@ -931,8 +944,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
function setCurrentPlayerInternal(player, targetInfo) {
- var previousPlayer = self._currentPlayer;
- var previousTargetInfo = currentTargetInfo;
+ const previousPlayer = self._currentPlayer;
+ const previousTargetInfo = currentTargetInfo;
if (player && !targetInfo && player.isLocalPlayer) {
targetInfo = createTarget(self, player);
@@ -983,7 +996,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
if (self.isPlaying(player)) {
- var playerData = getPlayerData(player);
+ const playerData = getPlayerData(player);
return playerData.streamInfo.mediaType === mediaType;
}
@@ -1022,7 +1035,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
self.canPlay = function (item) {
- var itemType = item.Type;
+ const itemType = item.Type;
if (itemType === 'PhotoAlbum' || itemType === 'MusicGenre' || itemType === 'Season' || itemType === 'Series' || itemType === 'BoxSet' || itemType === 'MusicAlbum' || itemType === 'MusicArtist' || itemType === 'Playlist') {
return true;
@@ -1052,12 +1065,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
player = player || self._currentPlayer;
if (player) {
- var current = self.getAspectRatio(player);
+ const current = self.getAspectRatio(player);
- var supported = self.getSupportedAspectRatios(player);
+ const supported = self.getSupportedAspectRatios(player);
- var index = -1;
- for (var i = 0, length = supported.length; i < length; i++) {
+ let index = -1;
+ for (let i = 0, length = supported.length; i < length; i++) {
if (supported[i].id === current) {
index = i;
break;
@@ -1099,7 +1112,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
};
- var brightnessOsdLoaded;
+ let brightnessOsdLoaded;
self.setBrightness = function (val, player) {
player = player || self._currentPlayer;
@@ -1107,7 +1120,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
if (!brightnessOsdLoaded) {
brightnessOsdLoaded = true;
// TODO: Have this trigger an event instead to get the osd out of here
- require(['brightnessOsd']);
+ import('brightnessOsd').then();
}
player.setBrightness(val);
}
@@ -1163,11 +1176,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return;
}
- var currentMediaSource = self.currentMediaSource(player);
- var mediaStreams = [];
- var i;
- var length;
- for (i = 0, length = currentMediaSource.MediaStreams.length; i < length; i++) {
+ const currentMediaSource = self.currentMediaSource(player);
+ const mediaStreams = [];
+ for (let i = 0, length = currentMediaSource.MediaStreams.length; i < length; i++) {
if (currentMediaSource.MediaStreams[i].Type === 'Audio') {
mediaStreams.push(currentMediaSource.MediaStreams[i]);
}
@@ -1178,16 +1189,16 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return;
}
- var currentStreamIndex = self.getAudioStreamIndex(player);
- var indexInList = -1;
- for (i = 0, length = mediaStreams.length; i < length; i++) {
+ const currentStreamIndex = self.getAudioStreamIndex(player);
+ let indexInList = -1;
+ for (let i = 0, length = mediaStreams.length; i < length; i++) {
if (mediaStreams[i].Index === currentStreamIndex) {
indexInList = i;
break;
}
}
- var nextIndex = indexInList + 1;
+ let nextIndex = indexInList + 1;
if (nextIndex >= mediaStreams.length) {
nextIndex = 0;
}
@@ -1207,11 +1218,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return;
}
- var currentMediaSource = self.currentMediaSource(player);
- var mediaStreams = [];
- var i;
- var length;
- for (i = 0, length = currentMediaSource.MediaStreams.length; i < length; i++) {
+ const currentMediaSource = self.currentMediaSource(player);
+ const mediaStreams = [];
+ for (let i = 0, length = currentMediaSource.MediaStreams.length; i < length; i++) {
if (currentMediaSource.MediaStreams[i].Type === 'Subtitle') {
mediaStreams.push(currentMediaSource.MediaStreams[i]);
}
@@ -1222,16 +1231,16 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return;
}
- var currentStreamIndex = self.getSubtitleStreamIndex(player);
- var indexInList = -1;
- for (i = 0, length = mediaStreams.length; i < length; i++) {
+ const currentStreamIndex = self.getSubtitleStreamIndex(player);
+ let indexInList = -1;
+ for (let i = 0, length = mediaStreams.length; i < length; i++) {
if (mediaStreams[i].Index === currentStreamIndex) {
indexInList = i;
break;
}
}
- var nextIndex = indexInList + 1;
+ let nextIndex = indexInList + 1;
if (nextIndex >= mediaStreams.length) {
nextIndex = -1;
}
@@ -1251,12 +1260,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
};
function isAudioStreamSupported(mediaSource, index, deviceProfile) {
- var mediaStream;
- var i;
- var length;
- var mediaStreams = mediaSource.MediaStreams;
+ let mediaStream;
+ const mediaStreams = mediaSource.MediaStreams;
- for (i = 0, length = mediaStreams.length; i < length; i++) {
+ for (let i = 0, length = mediaStreams.length; i < length; i++) {
if (mediaStreams[i].Type === 'Audio' && mediaStreams[i].Index === index) {
mediaStream = mediaStreams[i];
break;
@@ -1267,13 +1274,13 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return false;
}
- var codec = (mediaStream.Codec || '').toLowerCase();
+ const codec = (mediaStream.Codec || '').toLowerCase();
if (!codec) {
return false;
}
- var profiles = deviceProfile.DirectPlayProfiles || [];
+ const profiles = deviceProfile.DirectPlayProfiles || [];
return profiles.filter(function (p) {
if (p.Type === 'Video') {
@@ -1322,7 +1329,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
apiClient = connectionManager.currentApiClient();
}
- var endpointInfo = apiClient.getSavedEndpointInfo() || {};
+ const endpointInfo = apiClient.getSavedEndpointInfo() || {};
return appSettings.maxStreamingBitrate(endpointInfo.IsInNetwork, mediaType);
}
@@ -1333,16 +1340,16 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.getMaxStreamingBitrate();
}
- var playerData = getPlayerData(player);
+ const playerData = getPlayerData(player);
if (playerData.maxStreamingBitrate) {
return playerData.maxStreamingBitrate;
}
- var mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null;
- var currentItem = self.currentItem(player);
+ const mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null;
+ const currentItem = self.currentItem(player);
- var apiClient = currentItem ? connectionManager.getApiClient(currentItem.ServerId) : connectionManager.currentApiClient();
+ const apiClient = currentItem ? connectionManager.getApiClient(currentItem.ServerId) : connectionManager.currentApiClient();
return getSavedMaxStreamingBitrate(apiClient, mediaType);
};
@@ -1352,12 +1359,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.enableAutomaticBitrateDetection();
}
- var playerData = getPlayerData(player);
- var mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null;
- var currentItem = self.currentItem(player);
+ const playerData = getPlayerData(player);
+ const mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null;
+ const currentItem = self.currentItem(player);
- var apiClient = currentItem ? connectionManager.getApiClient(currentItem.ServerId) : connectionManager.currentApiClient();
- var endpointInfo = apiClient.getSavedEndpointInfo() || {};
+ const apiClient = currentItem ? connectionManager.getApiClient(currentItem.ServerId) : connectionManager.currentApiClient();
+ const endpointInfo = apiClient.getSavedEndpointInfo() || {};
return appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType);
};
@@ -1368,13 +1375,13 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.setMaxStreamingBitrate(options);
}
- var apiClient = connectionManager.getApiClient(self.currentItem(player).ServerId);
+ const apiClient = connectionManager.getApiClient(self.currentItem(player).ServerId);
apiClient.getEndpointInfo().then(function (endpointInfo) {
- var playerData = getPlayerData(player);
- var mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null;
+ const playerData = getPlayerData(player);
+ const mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null;
- var promise;
+ let promise;
if (options.enableAutomaticBitrateDetection) {
appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType, true);
promise = apiClient.detectBitrate(true);
@@ -1399,6 +1406,11 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.isFullscreen();
}
+ if (!screenfull.isEnabled) {
+ // iOS Safari
+ return document.webkitIsFullScreen;
+ }
+
return screenfull.isFullscreen;
};
@@ -1410,6 +1422,16 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
if (screenfull.isEnabled) {
screenfull.toggle();
+ } else {
+ // iOS Safari
+ if (document.webkitIsFullScreen && document.webkitCancelFullscreen) {
+ document.webkitCancelFullscreen();
+ } else {
+ const elem = document.querySelector('video');
+ if (elem && elem.webkitEnterFullscreen) {
+ elem.webkitEnterFullscreen();
+ }
+ }
}
};
@@ -1452,17 +1474,17 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.setSubtitleStreamIndex(index);
}
- var currentStream = getCurrentSubtitleStream(player);
+ const currentStream = getCurrentSubtitleStream(player);
- var newStream = getSubtitleStream(player, index);
+ const newStream = getSubtitleStream(player, index);
if (!currentStream && !newStream) {
return;
}
- var selectedTrackElementIndex = -1;
+ let selectedTrackElementIndex = -1;
- var currentPlayMethod = self.playMethod(player);
+ const currentPlayMethod = self.playMethod(player);
if (currentStream && !newStream) {
if (getDeliveryMethod(currentStream) === 'Encode' || (getDeliveryMethod(currentStream) === 'Embed' && currentPlayMethod === 'Transcode')) {
@@ -1499,30 +1521,30 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
getPlayerData(player).subtitleStreamIndex = index;
};
- self.supportSubtitleOffset = function(player) {
+ self.supportSubtitleOffset = function (player) {
player = player || self._currentPlayer;
return player && 'setSubtitleOffset' in player;
};
- self.enableShowingSubtitleOffset = function(player) {
+ self.enableShowingSubtitleOffset = function (player) {
player = player || self._currentPlayer;
player.enableShowingSubtitleOffset();
};
- self.disableShowingSubtitleOffset = function(player) {
+ self.disableShowingSubtitleOffset = function (player) {
player = player || self._currentPlayer;
if (player.disableShowingSubtitleOffset) {
player.disableShowingSubtitleOffset();
}
};
- self.isShowingSubtitleOffsetEnabled = function(player) {
+ self.isShowingSubtitleOffsetEnabled = function (player) {
player = player || self._currentPlayer;
return player.isShowingSubtitleOffsetEnabled();
};
- self.isSubtitleStreamExternal = function(index, player) {
- var stream = getSubtitleStream(player, index);
+ self.isSubtitleStreamExternal = function (index, player) {
+ const stream = getSubtitleStream(player, index);
return stream ? getDeliveryMethod(stream) === 'External' : false;
};
@@ -1533,15 +1555,15 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
};
- self.getPlayerSubtitleOffset = function(player) {
+ self.getPlayerSubtitleOffset = function (player) {
player = player || self._currentPlayer;
if (player.getSubtitleOffset) {
return player.getSubtitleOffset();
}
};
- self.canHandleOffsetOnCurrentSubtitle = function(player) {
- var index = self.getSubtitleStreamIndex(player);
+ self.canHandleOffsetOnCurrentSubtitle = function (player) {
+ const index = self.getSubtitleStreamIndex(player);
return index !== -1 && self.isSubtitleStreamExternal(index, player);
};
@@ -1570,7 +1592,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
}
- var ticks = getCurrentTicks(player) + offsetTicks;
+ const ticks = getCurrentTicks(player) + offsetTicks;
return this.seek(ticks, player);
};
@@ -1580,9 +1602,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
throw new Error('player cannot be null');
}
- var playerData = getPlayerData(player);
+ const playerData = getPlayerData(player);
- var currentSrc = (playerData.streamInfo.url || '').toLowerCase();
+ const currentSrc = (playerData.streamInfo.url || '').toLowerCase();
if (currentSrc.indexOf('.m3u8') !== -1) {
return true;
@@ -1592,7 +1614,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.seekable();
}
- var isPlayMethodTranscode = self.playMethod(player) === 'Transcode';
+ const isPlayMethodTranscode = self.playMethod(player) === 'Transcode';
if (isPlayMethodTranscode) {
return false;
@@ -1609,37 +1631,35 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
params = params || {};
- var liveStreamId = getPlayerData(player).streamInfo.liveStreamId;
- var lastMediaInfoQuery = getPlayerData(player).streamInfo.lastMediaInfoQuery;
+ const liveStreamId = getPlayerData(player).streamInfo.liveStreamId;
+ const lastMediaInfoQuery = getPlayerData(player).streamInfo.lastMediaInfoQuery;
- var playSessionId = self.playSessionId(player);
+ const playSessionId = self.playSessionId(player);
- var currentItem = self.currentItem(player);
+ const currentItem = self.currentItem(player);
player.getDeviceProfile(currentItem, {
-
isRetry: params.EnableDirectPlay === false
-
}).then(function (deviceProfile) {
- var audioStreamIndex = params.AudioStreamIndex == null ? getPlayerData(player).audioStreamIndex : params.AudioStreamIndex;
- var subtitleStreamIndex = params.SubtitleStreamIndex == null ? getPlayerData(player).subtitleStreamIndex : params.SubtitleStreamIndex;
+ const audioStreamIndex = params.AudioStreamIndex == null ? getPlayerData(player).audioStreamIndex : params.AudioStreamIndex;
+ const subtitleStreamIndex = params.SubtitleStreamIndex == null ? getPlayerData(player).subtitleStreamIndex : params.SubtitleStreamIndex;
- var currentMediaSource = self.currentMediaSource(player);
- var apiClient = connectionManager.getApiClient(currentItem.ServerId);
+ let currentMediaSource = self.currentMediaSource(player);
+ const apiClient = connectionManager.getApiClient(currentItem.ServerId);
if (ticks) {
ticks = parseInt(ticks);
}
- var maxBitrate = params.MaxStreamingBitrate || self.getMaxStreamingBitrate(player);
+ const maxBitrate = params.MaxStreamingBitrate || self.getMaxStreamingBitrate(player);
- var currentPlayOptions = currentItem.playOptions || getDefaultPlayOptions();
+ const currentPlayOptions = currentItem.playOptions || getDefaultPlayOptions();
getPlaybackInfo(player, apiClient, currentItem, deviceProfile, maxBitrate, ticks, true, currentMediaSource.Id, audioStreamIndex, subtitleStreamIndex, liveStreamId, params.EnableDirectPlay, params.EnableDirectStream, params.AllowVideoStreamCopy, params.AllowAudioStreamCopy).then(function (result) {
if (validatePlaybackInfoResult(self, result)) {
currentMediaSource = result.MediaSources[0];
- var streamInfo = createStreamInfo(apiClient, currentItem.MediaType, currentItem, currentMediaSource, ticks);
+ const streamInfo = createStreamInfo(apiClient, currentItem.MediaType, currentItem, currentMediaSource, ticks);
streamInfo.fullscreen = currentPlayOptions.fullscreen;
streamInfo.lastMediaInfoQuery = lastMediaInfoQuery;
@@ -1659,14 +1679,14 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
function changeStreamToUrl(apiClient, player, playSessionId, streamInfo, newPositionTicks) {
- var playerData = getPlayerData(player);
+ const playerData = getPlayerData(player);
playerData.isChangingStream = true;
if (playerData.streamInfo && playSessionId) {
apiClient.stopActiveEncodings(playSessionId).then(function () {
// Stop the first transcoding afterwards because the player may still send requests to the original url
- var afterSetSrc = function () {
+ const afterSetSrc = function () {
apiClient.stopActiveEncodings(playSessionId);
};
setSrcIntoPlayer(apiClient, player, streamInfo).then(afterSetSrc, afterSetSrc);
@@ -1678,7 +1698,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
function setSrcIntoPlayer(apiClient, player, streamInfo) {
return player.play(streamInfo).then(function () {
- var playerData = getPlayerData(player);
+ const playerData = getPlayerData(player);
playerData.isChangingStream = false;
playerData.streamInfo = streamInfo;
@@ -1687,7 +1707,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
sendProgressUpdate(player, 'timeupdate');
}, function (e) {
- var playerData = getPlayerData(player);
+ const playerData = getPlayerData(player);
playerData.isChangingStream = false;
onPlaybackError.call(player, e, {
@@ -1705,12 +1725,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
});
}
- var firstItem = items[0];
- var promise;
+ const firstItem = items[0];
+ let promise;
- var serverId = firstItem.ServerId;
+ const serverId = firstItem.ServerId;
- var queryOptions = options.queryOptions || {};
+ const queryOptions = options.queryOptions || {};
if (firstItem.Type === 'Program') {
promise = getItemsForPlayback(serverId, {
@@ -1738,9 +1758,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
SortBy: options.shuffle ? 'Random' : 'SortName',
MediaTypes: 'Photo,Video'
}).then(function (result) {
- var items = result.Items;
+ const items = result.Items;
- var index = items.map(function (i) {
+ let index = items.map(function (i) {
return i.Id;
}).indexOf(firstItem.Id);
@@ -1761,7 +1781,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
SortBy: options.shuffle ? 'Random' : 'SortName',
MediaTypes: 'Photo,Video',
Limit: 1000
-
});
} else if (firstItem.Type === 'MusicGenre') {
promise = getItemsForPlayback(serverId, {
@@ -1773,18 +1792,16 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
});
} else if (firstItem.IsFolder) {
promise = getItemsForPlayback(serverId, mergePlaybackQueries({
-
ParentId: firstItem.Id,
Filters: 'IsNotFolder',
Recursive: true,
// These are pre-sorted
SortBy: options.shuffle ? 'Random' : (['BoxSet'].indexOf(firstItem.Type) === -1 ? 'SortName' : null),
MediaTypes: 'Audio,Video'
-
}, queryOptions));
} else if (firstItem.Type === 'Episode' && items.length === 1 && getPlayer(firstItem, options).supportsProgress !== false) {
promise = new Promise(function (resolve, reject) {
- var apiClient = connectionManager.getApiClient(firstItem.ServerId);
+ const apiClient = connectionManager.getApiClient(firstItem.ServerId);
apiClient.getCurrentUser().then(function (user) {
if (!user.Configuration.EnableNextEpisodeAutoPlay || !firstItem.SeriesId) {
@@ -1797,9 +1814,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
IsMissing: false,
UserId: apiClient.getCurrentUserId(),
Fields: 'Chapters'
-
}).then(function (episodesResult) {
- var foundItem = false;
+ let foundItem = false;
episodesResult.Items = episodesResult.Items.filter(function (e) {
if (foundItem) {
return true;
@@ -1854,9 +1870,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
return getItemsForPlayback(options.serverId, {
-
Ids: options.ids.join(',')
-
}).then(function (result) {
return translateItemsForPlayback(result.Items, options).then(function (items) {
return playWithIntros(items, options);
@@ -1872,7 +1886,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
if (!player.name) {
throw new Error('player name cannot be null');
}
- var state = playerStates[player.name];
+ let state = playerStates[player.name];
if (!state) {
playerStates[player.name] = {};
@@ -1896,7 +1910,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
item = item || self.currentItem(player);
mediaSource = mediaSource || self.currentMediaSource(player);
- var state = {
+ const state = {
PlayState: {}
};
@@ -1954,13 +1968,13 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
throw new Error('player cannot be null');
}
- var mediaSource = self.currentMediaSource(player);
+ const mediaSource = self.currentMediaSource(player);
if (mediaSource && mediaSource.RunTimeTicks) {
return mediaSource.RunTimeTicks;
}
- var playerDuration = player.duration();
+ let playerDuration = player.duration();
if (playerDuration) {
playerDuration *= 10000;
@@ -1974,9 +1988,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
throw new Error('player cannot be null');
}
- var playerTime = Math.floor(10000 * (player || self._currentPlayer).currentTime());
+ let playerTime = Math.floor(10000 * (player).currentTime());
- var streamInfo = getPlayerData(player).streamInfo;
+ const streamInfo = getPlayerData(player).streamInfo;
if (streamInfo) {
playerTime += getPlayerData(player).streamInfo.transcodingOffsetTicks || 0;
}
@@ -1988,8 +2002,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
self.getCurrentTicks = getCurrentTicks;
function playOther(items, options, user) {
- var playStartIndex = options.startIndex || 0;
- var player = getPlayer(items[playStartIndex], options);
+ const playStartIndex = options.startIndex || 0;
+ const player = getPlayer(items[playStartIndex], options);
loading.hide();
@@ -1999,8 +2013,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
function playWithIntros(items, options, user) {
- var playStartIndex = options.startIndex || 0;
- var firstItem = items[playStartIndex];
+ let playStartIndex = options.startIndex || 0;
+ let firstItem = items[playStartIndex];
// If index was bad, reset it
if (!firstItem) {
@@ -2018,11 +2032,11 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return playOther(items, options, user);
}
- var apiClient = connectionManager.getApiClient(firstItem.ServerId);
+ const apiClient = connectionManager.getApiClient(firstItem.ServerId);
return getIntros(firstItem, apiClient, options).then(function (introsResult) {
- var introItems = introsResult.Items;
- var introPlayOptions;
+ const introItems = introsResult.Items;
+ let introPlayOptions;
firstItem.playOptions = truncatePlayOptions(options);
@@ -2078,9 +2092,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
// TODO: This should be the media type requested, not the original media type
- var mediaType = item.MediaType;
+ const mediaType = item.MediaType;
- var onBitrateDetectionFailure = function () {
+ const onBitrateDetectionFailure = function () {
return playAfterBitrateDetect(getSavedMaxStreamingBitrate(connectionManager.getApiClient(item.ServerId), mediaType), item, playOptions, onPlaybackStartedFn);
};
@@ -2088,7 +2102,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return onBitrateDetectionFailure();
}
- var apiClient = connectionManager.getApiClient(item.ServerId);
+ const apiClient = connectionManager.getApiClient(item.ServerId);
apiClient.getEndpointInfo().then(function (endpointInfo) {
if ((mediaType === 'Video' || mediaType === 'Audio') && appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType)) {
return apiClient.detectBitrate().then(function (bitrate) {
@@ -2104,7 +2118,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
function onInterceptorRejection() {
- var player = self._currentPlayer;
+ const player = self._currentPlayer;
if (player) {
destroyPlayer(player);
@@ -2122,7 +2136,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
function runInterceptors(item, playOptions) {
return new Promise(function (resolve, reject) {
- var interceptors = pluginManager.ofType('preplayintercept');
+ const interceptors = pluginManager.ofType('preplayintercept');
interceptors.sort(function (a, b) {
return (a.order || 0) - (b.order || 0);
@@ -2135,7 +2149,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
loading.hide();
- var options = Object.assign({}, playOptions);
+ const options = Object.assign({}, playOptions);
options.mediaType = item.MediaType;
options.item = item;
@@ -2150,7 +2164,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return;
}
- var interceptor = interceptors[index];
+ const interceptor = interceptors[index];
interceptor.intercept(options).then(function () {
runNextPrePlay(interceptors, index + 1, options, resolve, reject);
@@ -2173,12 +2187,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
function playAfterBitrateDetect(maxBitrate, item, playOptions, onPlaybackStartedFn) {
- var startPosition = playOptions.startPositionTicks;
+ const startPosition = playOptions.startPositionTicks;
- var player = getPlayer(item, playOptions);
- var activePlayer = self._currentPlayer;
+ const player = getPlayer(item, playOptions);
+ const activePlayer = self._currentPlayer;
- var promise;
+ let promise;
if (activePlayer) {
// TODO: if changing players within the same playlist, this will cause nextItem to be null
@@ -2190,7 +2204,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
if (!isServerItem(item) || item.MediaType === 'Book') {
return promise.then(function () {
- var streamInfo = createStreamInfoFromUrlItem(item);
+ const streamInfo = createStreamInfoFromUrlItem(item);
streamInfo.fullscreen = playOptions.fullscreen;
getPlayerData(player).isChangingStream = false;
return player.play(streamInfo).then(function () {
@@ -2205,13 +2219,13 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
return Promise.all([promise, player.getDeviceProfile(item)]).then(function (responses) {
- var deviceProfile = responses[1];
+ const deviceProfile = responses[1];
- var apiClient = connectionManager.getApiClient(item.ServerId);
+ const apiClient = connectionManager.getApiClient(item.ServerId);
- var mediaSourceId = playOptions.mediaSourceId;
- var audioStreamIndex = playOptions.audioStreamIndex;
- var subtitleStreamIndex = playOptions.subtitleStreamIndex;
+ const mediaSourceId = playOptions.mediaSourceId;
+ const audioStreamIndex = playOptions.audioStreamIndex;
+ const subtitleStreamIndex = playOptions.subtitleStreamIndex;
if (player && !enableLocalPlaylistManagement(player)) {
return sendPlaybackListToPlayer(player, playOptions.items, deviceProfile, maxBitrate, apiClient, startPosition, mediaSourceId, audioStreamIndex, subtitleStreamIndex, playOptions.startIndex);
@@ -2221,7 +2235,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
playOptions.items = null;
return getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, mediaSourceId, audioStreamIndex, subtitleStreamIndex).then(function (mediaSource) {
- var streamInfo = createStreamInfo(apiClient, item.MediaType, item, mediaSource, startPosition);
+ const streamInfo = createStreamInfo(apiClient, item.MediaType, item, mediaSource, startPosition);
streamInfo.fullscreen = playOptions.fullscreen;
@@ -2249,14 +2263,14 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
self.getPlaybackInfo = function (item, options) {
options = options || {};
- var startPosition = options.startPositionTicks || 0;
- var mediaType = options.mediaType || item.MediaType;
- var player = getPlayer(item, options);
- var apiClient = connectionManager.getApiClient(item.ServerId);
+ const startPosition = options.startPositionTicks || 0;
+ const mediaType = options.mediaType || item.MediaType;
+ const player = getPlayer(item, options);
+ const apiClient = connectionManager.getApiClient(item.ServerId);
// Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate
return apiClient.getEndpointInfo().then(function () {
- var maxBitrate = getSavedMaxStreamingBitrate(connectionManager.getApiClient(item.ServerId), mediaType);
+ const maxBitrate = getSavedMaxStreamingBitrate(connectionManager.getApiClient(item.ServerId), mediaType);
return player.getDeviceProfile(item).then(function (deviceProfile) {
return getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, options.mediaSourceId, options.audioStreamIndex, options.subtitleStreamIndex).then(function (mediaSource) {
@@ -2268,15 +2282,15 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
self.getPlaybackMediaSources = function (item, options) {
options = options || {};
- var startPosition = options.startPositionTicks || 0;
- var mediaType = options.mediaType || item.MediaType;
+ const startPosition = options.startPositionTicks || 0;
+ const mediaType = options.mediaType || item.MediaType;
// TODO: Remove the true forceLocalPlayer hack
- var player = getPlayer(item, options, true);
- var apiClient = connectionManager.getApiClient(item.ServerId);
+ const player = getPlayer(item, options, true);
+ const apiClient = connectionManager.getApiClient(item.ServerId);
// Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate
return apiClient.getEndpointInfo().then(function () {
- var maxBitrate = getSavedMaxStreamingBitrate(connectionManager.getApiClient(item.ServerId), mediaType);
+ const maxBitrate = getSavedMaxStreamingBitrate(connectionManager.getApiClient(item.ServerId), mediaType);
return player.getDeviceProfile(item).then(function (deviceProfile) {
return getPlaybackInfo(player, apiClient, item, deviceProfile, maxBitrate, startPosition, false, null, null, null, null).then(function (playbackInfoResult) {
@@ -2287,16 +2301,16 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
};
function createStreamInfo(apiClient, type, item, mediaSource, startPosition) {
- var mediaUrl;
- var contentType;
- var transcodingOffsetTicks = 0;
- var playerStartPositionTicks = startPosition;
- var liveStreamId = mediaSource.LiveStreamId;
+ let mediaUrl;
+ let contentType;
+ let transcodingOffsetTicks = 0;
+ const playerStartPositionTicks = startPosition;
+ const liveStreamId = mediaSource.LiveStreamId;
- var playMethod = 'Transcode';
+ let playMethod = 'Transcode';
- var mediaSourceContainer = (mediaSource.Container || '').toLowerCase();
- var directOptions;
+ const mediaSourceContainer = (mediaSource.Container || '').toLowerCase();
+ let directOptions;
if (type === 'Video' || type === 'Audio') {
contentType = getMimeType(type.toLowerCase(), mediaSourceContainer);
@@ -2325,7 +2339,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
directOptions.LiveStreamId = mediaSource.LiveStreamId;
}
- var prefix = type === 'Video' ? 'Videos' : 'Audio';
+ const prefix = type === 'Video' ? 'Videos' : 'Audio';
mediaUrl = apiClient.getUrl(prefix + '/' + item.Id + '/stream.' + mediaSourceContainer, directOptions);
playMethod = 'DirectStream';
@@ -2354,7 +2368,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
playMethod = 'DirectPlay';
}
- var resultInfo = {
+ const resultInfo = {
url: mediaUrl,
mimeType: contentType,
transcodingOffsetTicks: transcodingOffsetTicks,
@@ -2371,7 +2385,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
title: item.Name
};
- var backdropUrl = backdropImageUrl(apiClient, item, {});
+ const backdropUrl = backdropImageUrl(apiClient, item, {});
if (backdropUrl) {
resultInfo.backdropUrl = backdropUrl;
}
@@ -2380,19 +2394,19 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
function getTextTracks(apiClient, item, mediaSource) {
- var subtitleStreams = mediaSource.MediaStreams.filter(function (s) {
+ const subtitleStreams = mediaSource.MediaStreams.filter(function (s) {
return s.Type === 'Subtitle';
});
- var textStreams = subtitleStreams.filter(function (s) {
+ const textStreams = subtitleStreams.filter(function (s) {
return s.DeliveryMethod === 'External';
});
- var tracks = [];
+ const tracks = [];
- for (var i = 0, length = textStreams.length; i < length; i++) {
- var textStream = textStreams[i];
- var textStreamUrl;
+ for (let i = 0, length = textStreams.length; i < length; i++) {
+ const textStream = textStreams[i];
+ let textStreamUrl;
if (itemHelper.isLocalItem(item)) {
textStreamUrl = textStream.Path;
@@ -2439,7 +2453,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
function getPlayer(item, playOptions, forceLocalPlayers) {
- var serverItem = isServerItem(item);
+ const serverItem = isServerItem(item);
return getAutomaticPlayers(self, forceLocalPlayers).filter(function (p) {
if (p.canPlayMediaType(item.MediaType)) {
if (serverItem) {
@@ -2462,11 +2476,11 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.setCurrentPlaylistItem(playlistItemId);
}
- var newItem;
- var newItemIndex;
- var playlist = self._playQueueManager.getPlaylist();
+ let newItem;
+ let newItemIndex;
+ const playlist = self._playQueueManager.getPlaylist();
- for (var i = 0, length = playlist.length; i < length; i++) {
+ for (let i = 0, length = playlist.length; i < length; i++) {
if (playlist[i].PlaylistItemId === playlistItemId) {
newItem = playlist[i];
newItemIndex = i;
@@ -2475,7 +2489,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
if (newItem) {
- var newItemPlayOptions = newItem.playOptions || getDefaultPlayOptions();
+ const newItemPlayOptions = newItem.playOptions || getDefaultPlayOptions();
playInternal(newItem, newItemPlayOptions, function () {
setPlaylistState(newItem.PlaylistItemId, newItemIndex);
@@ -2493,18 +2507,19 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.removeFromPlaylist(playlistItemIds);
}
- var removeResult = self._playQueueManager.removeFromPlaylist(playlistItemIds);
+ const removeResult = self._playQueueManager.removeFromPlaylist(playlistItemIds);
if (removeResult.result === 'empty') {
return self.stop(player);
}
- var isCurrentIndex = removeResult.isCurrentIndex;
+ const isCurrentIndex = removeResult.isCurrentIndex;
events.trigger(player, 'playlistitemremove', [
{
playlistItemIds: playlistItemIds
- }]);
+ }
+ ]);
if (isCurrentIndex) {
return self.setCurrentPlaylistItem(self._playQueueManager.getPlaylist()[0].PlaylistItemId, player);
@@ -2519,7 +2534,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.movePlaylistItem(playlistItemId, newIndex);
}
- var moveResult = self._playQueueManager.movePlaylistItem(playlistItemId, newIndex);
+ const moveResult = self._playQueueManager.movePlaylistItem(playlistItemId, newIndex);
if (moveResult.result === 'noop') {
return;
@@ -2529,7 +2544,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
{
playlistItemId: moveResult.playlistItemId,
newIndex: moveResult.newIndex
- }]);
+ }
+ ]);
};
self.getCurrentPlaylistIndex = function (player) {
@@ -2566,12 +2582,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.nextTrack();
}
- var newItemInfo = self._playQueueManager.getNextItemInfo();
+ const newItemInfo = self._playQueueManager.getNextItemInfo();
if (newItemInfo) {
console.debug('playing next track');
- var newItemPlayOptions = newItemInfo.item.playOptions || getDefaultPlayOptions();
+ const newItemPlayOptions = newItemInfo.item.playOptions || getDefaultPlayOptions();
playInternal(newItemInfo.item, newItemPlayOptions, function () {
setPlaylistState(newItemInfo.item.PlaylistItemId, newItemInfo.index);
@@ -2585,13 +2601,13 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return player.previousTrack();
}
- var newIndex = self.getCurrentPlaylistIndex(player) - 1;
+ const newIndex = self.getCurrentPlaylistIndex(player) - 1;
if (newIndex >= 0) {
- var playlist = self._playQueueManager.getPlaylist();
- var newItem = playlist[newIndex];
+ const playlist = self._playQueueManager.getPlaylist();
+ const newItem = playlist[newIndex];
if (newItem) {
- var newItemPlayOptions = newItem.playOptions || getDefaultPlayOptions();
+ const newItemPlayOptions = newItem.playOptions || getDefaultPlayOptions();
newItemPlayOptions.startPositionTicks = 0;
playInternal(newItem, newItemPlayOptions, function () {
@@ -2627,9 +2643,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
return getItemsForPlayback(options.serverId, {
-
Ids: options.ids.join(',')
-
}).then(function (result) {
return translateItemsForPlayback(result.Items, options).then(function (items) {
// TODO: Handle options.startIndex for photos
@@ -2657,10 +2671,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return;
}
- var queueDirectToPlayer = player && !enableLocalPlaylistManagement(player);
+ const queueDirectToPlayer = player && !enableLocalPlaylistManagement(player);
if (queueDirectToPlayer) {
- var apiClient = connectionManager.getApiClient(items[0].ServerId);
+ const apiClient = connectionManager.getApiClient(items[0].ServerId);
player.getDeviceProfile(items[0]).then(function (profile) {
setStreamUrls(items, profile, self.getMaxStreamingBitrate(player), apiClient, 0).then(function () {
@@ -2684,7 +2698,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
function onPlayerProgressInterval() {
- var player = this;
+ const player = this;
sendProgressUpdate(player, 'timeupdate');
}
@@ -2708,7 +2722,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
setCurrentPlayerInternal(player);
- var playerData = getPlayerData(player);
+ const playerData = getPlayerData(player);
playerData.streamInfo = streamInfo;
@@ -2723,10 +2737,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
self._playNextAfterEnded = true;
- var isFirstItem = playOptions.isFirstItem;
- var fullscreen = playOptions.fullscreen;
+ const isFirstItem = playOptions.isFirstItem;
+ const fullscreen = playOptions.fullscreen;
- var state = self.getPlayerState(player, streamInfo.item, streamInfo.mediaSource);
+ const state = self.getPlayerState(player, streamInfo.item, streamInfo.mediaSource);
reportPlayback(self, state, player, true, state.NowPlayingItem.ServerId, 'reportPlaybackStart');
@@ -2742,22 +2756,22 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
function onPlaybackStartedFromSelfManagingPlayer(e, item, mediaSource) {
- var player = this;
+ const player = this;
setCurrentPlayerInternal(player);
- var playOptions = item.playOptions || getDefaultPlayOptions();
- var isFirstItem = playOptions.isFirstItem;
- var fullscreen = playOptions.fullscreen;
+ const playOptions = item.playOptions || getDefaultPlayOptions();
+ const isFirstItem = playOptions.isFirstItem;
+ const fullscreen = playOptions.fullscreen;
playOptions.isFirstItem = false;
- var playerData = getPlayerData(player);
+ const playerData = getPlayerData(player);
playerData.streamInfo = {};
- var streamInfo = playerData.streamInfo;
+ const streamInfo = playerData.streamInfo;
streamInfo.playbackStartTimeTicks = new Date().getTime() * 10000;
- var state = self.getPlayerState(player, item, mediaSource);
+ const state = self.getPlayerState(player, item, mediaSource);
reportPlayback(self, state, player, true, state.NowPlayingItem.ServerId, 'reportPlaybackStart');
@@ -2773,15 +2787,15 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
function onPlaybackStoppedFromSelfManagingPlayer(e, playerStopInfo) {
- var player = this;
+ const player = this;
stopPlaybackProgressTimer(player);
- var state = self.getPlayerState(player, playerStopInfo.item, playerStopInfo.mediaSource);
+ const state = self.getPlayerState(player, playerStopInfo.item, playerStopInfo.mediaSource);
- var nextItem = playerStopInfo.nextItem;
- var nextMediaType = playerStopInfo.nextMediaType;
+ const nextItem = playerStopInfo.nextItem;
+ const nextMediaType = playerStopInfo.nextMediaType;
- var playbackStopInfo = {
+ const playbackStopInfo = {
player: player,
state: state,
nextItem: (nextItem ? nextItem.item : null),
@@ -2790,7 +2804,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
state.NextMediaType = nextMediaType;
- var streamInfo = getPlayerData(player).streamInfo;
+ const streamInfo = getPlayerData(player).streamInfo;
// only used internally as a safeguard to avoid reporting other events to the server after playback stopped
streamInfo.ended = true;
@@ -2806,8 +2820,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
events.trigger(player, 'playbackstop', [state]);
events.trigger(self, 'playbackstop', [playbackStopInfo]);
- var nextItemPlayOptions = nextItem ? (nextItem.item.playOptions || getDefaultPlayOptions()) : getDefaultPlayOptions();
- var newPlayer = nextItem ? getPlayer(nextItem.item, nextItemPlayOptions) : null;
+ const nextItemPlayOptions = nextItem ? (nextItem.item.playOptions || getDefaultPlayOptions()) : getDefaultPlayOptions();
+ const newPlayer = nextItem ? getPlayer(nextItem.item, nextItemPlayOptions) : null;
if (newPlayer !== player) {
destroyPlayer(player);
@@ -2817,7 +2831,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
function enablePlaybackRetryWithTranscoding(streamInfo, errorType, currentlyPreventsVideoStreamCopy, currentlyPreventsAudioStreamCopy) {
// mediadecodeerror, medianotsupported, network, servererror
-
if (streamInfo.mediaSource.SupportsTranscoding && (!currentlyPreventsVideoStreamCopy || !currentlyPreventsAudioStreamCopy)) {
return true;
}
@@ -2826,46 +2839,44 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
function onPlaybackError(e, error) {
- var player = this;
+ const player = this;
error = error || {};
// network
// mediadecodeerror
// medianotsupported
- var errorType = error.type;
+ const errorType = error.type;
console.debug('playbackmanager playback error type: ' + (errorType || ''));
- var streamInfo = error.streamInfo || getPlayerData(player).streamInfo;
+ const streamInfo = error.streamInfo || getPlayerData(player).streamInfo;
if (streamInfo) {
- var currentlyPreventsVideoStreamCopy = streamInfo.url.toLowerCase().indexOf('allowvideostreamcopy=false') !== -1;
- var currentlyPreventsAudioStreamCopy = streamInfo.url.toLowerCase().indexOf('allowaudiostreamcopy=false') !== -1;
+ const currentlyPreventsVideoStreamCopy = streamInfo.url.toLowerCase().indexOf('allowvideostreamcopy=false') !== -1;
+ const currentlyPreventsAudioStreamCopy = streamInfo.url.toLowerCase().indexOf('allowaudiostreamcopy=false') !== -1;
// Auto switch to transcoding
if (enablePlaybackRetryWithTranscoding(streamInfo, errorType, currentlyPreventsVideoStreamCopy, currentlyPreventsAudioStreamCopy)) {
- var startTime = getCurrentTicks(player) || streamInfo.playerStartPositionTicks;
+ const startTime = getCurrentTicks(player) || streamInfo.playerStartPositionTicks;
changeStream(player, startTime, {
-
// force transcoding
EnableDirectPlay: false,
EnableDirectStream: false,
AllowVideoStreamCopy: false,
AllowAudioStreamCopy: currentlyPreventsAudioStreamCopy || currentlyPreventsVideoStreamCopy ? false : null
-
});
return;
}
}
- var displayErrorCode = 'NoCompatibleStream';
+ const displayErrorCode = 'NoCompatibleStream';
onPlaybackStopped.call(player, e, displayErrorCode);
}
function onPlaybackStopped(e, displayErrorCode) {
- var player = this;
+ const player = this;
if (getPlayerData(player).isChangingStream) {
return;
@@ -2874,15 +2885,15 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
stopPlaybackProgressTimer(player);
// User clicked stop or content ended
- var state = self.getPlayerState(player);
- var data = getPlayerData(player);
- var streamInfo = data.streamInfo;
+ const state = self.getPlayerState(player);
+ const data = getPlayerData(player);
+ const streamInfo = data.streamInfo;
- var nextItem = self._playNextAfterEnded ? self._playQueueManager.getNextItemInfo() : null;
+ const nextItem = self._playNextAfterEnded ? self._playQueueManager.getNextItemInfo() : null;
- var nextMediaType = (nextItem ? nextItem.item.MediaType : null);
+ const nextMediaType = (nextItem ? nextItem.item.MediaType : null);
- var playbackStopInfo = {
+ const playbackStopInfo = {
player: player,
state: state,
nextItem: (nextItem ? nextItem.item : null),
@@ -2911,8 +2922,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
events.trigger(player, 'playbackstop', [state]);
events.trigger(self, 'playbackstop', [playbackStopInfo]);
- var nextItemPlayOptions = nextItem ? (nextItem.item.playOptions || getDefaultPlayOptions()) : getDefaultPlayOptions();
- var newPlayer = nextItem ? getPlayer(nextItem.item, nextItemPlayOptions) : null;
+ const nextItemPlayOptions = nextItem ? (nextItem.item.playOptions || getDefaultPlayOptions()) : getDefaultPlayOptions();
+ const newPlayer = nextItem ? getPlayer(nextItem.item, nextItemPlayOptions) : null;
if (newPlayer !== player) {
destroyPlayer(player);
@@ -2930,12 +2941,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
function onPlaybackChanging(activePlayer, newPlayer, newItem) {
- var state = self.getPlayerState(activePlayer);
+ const state = self.getPlayerState(activePlayer);
- var serverId = self.currentItem(activePlayer).ServerId;
+ const serverId = self.currentItem(activePlayer).ServerId;
// User started playing something new while existing content is playing
- var promise;
+ let promise;
stopPlaybackProgressTimer(activePlayer);
unbindStopped(activePlayer);
@@ -2972,47 +2983,47 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
function onPlaybackTimeUpdate(e) {
- var player = this;
+ const player = this;
sendProgressUpdate(player, 'timeupdate');
}
function onPlaybackPause(e) {
- var player = this;
+ const player = this;
sendProgressUpdate(player, 'pause');
}
function onPlaybackUnpause(e) {
- var player = this;
+ const player = this;
sendProgressUpdate(player, 'unpause');
}
function onPlaybackVolumeChange(e) {
- var player = this;
+ const player = this;
sendProgressUpdate(player, 'volumechange');
}
function onRepeatModeChange(e) {
- var player = this;
+ const player = this;
sendProgressUpdate(player, 'repeatmodechange');
}
function onShuffleQueueModeChange() {
- var player = this;
+ const player = this;
sendProgressUpdate(player, 'shufflequeuemodechange');
}
function onPlaylistItemMove(e) {
- var player = this;
+ const player = this;
sendProgressUpdate(player, 'playlistitemmove', true);
}
function onPlaylistItemRemove(e) {
- var player = this;
+ const player = this;
sendProgressUpdate(player, 'playlistitemremove', true);
}
function onPlaylistItemAdd(e) {
- var player = this;
+ const player = this;
sendProgressUpdate(player, 'playlistitemadd', true);
}
@@ -3089,12 +3100,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
throw new Error('player cannot be null');
}
- var state = self.getPlayerState(player);
+ const state = self.getPlayerState(player);
if (state.NowPlayingItem) {
- var serverId = state.NowPlayingItem.ServerId;
+ const serverId = state.NowPlayingItem.ServerId;
- var streamInfo = getPlayerData(player).streamInfo;
+ const streamInfo = getPlayerData(player).streamInfo;
if (streamInfo && streamInfo.started && !streamInfo.ended) {
reportPlayback(self, state, player, reportPlaylist, serverId, 'reportPlaybackProgress', progressEventName);
@@ -3113,7 +3124,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
streamInfo.lastMediaInfoQuery = new Date().getTime();
- var apiClient = connectionManager.getApiClient(serverId);
+ const apiClient = connectionManager.getApiClient(serverId);
if (!apiClient.isMinServerVersion('3.2.70.7')) {
return;
@@ -3123,12 +3134,11 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
mediaSource.MediaStreams = info.MediaStreams;
events.trigger(player, 'mediastreamschange');
}, function () {
-
});
}
self.onAppClose = function () {
- var player = this._currentPlayer;
+ const player = this._currentPlayer;
// Try to report playback stopped before the app closes
if (player && this.isPlaying(player)) {
@@ -3137,89 +3147,80 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
};
- self.playbackStartTime = function (player) {
- player = player || this._currentPlayer;
+ self.playbackStartTime = function (player = this._currentPlayer) {
if (player && !enableLocalPlaylistManagement(player) && !player.isLocalPlayer) {
return player.playbackStartTime();
}
- var streamInfo = getPlayerData(player).streamInfo;
+ const streamInfo = getPlayerData(player).streamInfo;
return streamInfo ? streamInfo.playbackStartTimeTicks : null;
};
if (apphost.supports('remotecontrol')) {
- require(['serverNotifications'], function (serverNotifications) {
+ import('serverNotifications').then(({ default: serverNotifications }) => {
events.on(serverNotifications, 'ServerShuttingDown', self.setDefaultPlayerActive.bind(self));
events.on(serverNotifications, 'ServerRestarting', self.setDefaultPlayerActive.bind(self));
});
}
}
- PlaybackManager.prototype.getCurrentPlayer = function () {
+ getCurrentPlayer() {
return this._currentPlayer;
- };
+ }
- PlaybackManager.prototype.currentTime = function (player) {
- player = player || this._currentPlayer;
+ currentTime(player = this._currentPlayer) {
if (player && !enableLocalPlaylistManagement(player) && !player.isLocalPlayer) {
return player.currentTime();
}
return this.getCurrentTicks(player);
- };
-
- PlaybackManager.prototype.nextItem = function (player) {
- player = player || this._currentPlayer;
+ }
+ nextItem(player = this._currentPlayer) {
if (player && !enableLocalPlaylistManagement(player)) {
return player.nextItem();
}
- var nextItem = this._playQueueManager.getNextItemInfo();
+ const nextItem = this._playQueueManager.getNextItemInfo();
if (!nextItem || !nextItem.item) {
return Promise.reject();
}
- var apiClient = connectionManager.getApiClient(nextItem.item.ServerId);
+ const apiClient = connectionManager.getApiClient(nextItem.item.ServerId);
return apiClient.getItem(apiClient.getCurrentUserId(), nextItem.item.Id);
- };
+ }
- PlaybackManager.prototype.canQueue = function (item) {
+ canQueue(item) {
if (item.Type === 'MusicAlbum' || item.Type === 'MusicArtist' || item.Type === 'MusicGenre') {
return this.canQueueMediaType('Audio');
}
return this.canQueueMediaType(item.MediaType);
- };
+ }
- PlaybackManager.prototype.canQueueMediaType = function (mediaType) {
+ canQueueMediaType(mediaType) {
if (this._currentPlayer) {
return this._currentPlayer.canPlayMediaType(mediaType);
}
return false;
- };
-
- PlaybackManager.prototype.isMuted = function (player) {
- player = player || this._currentPlayer;
+ }
+ isMuted(player = this._currentPlayer) {
if (player) {
return player.isMuted();
}
return false;
- };
-
- PlaybackManager.prototype.setMute = function (mute, player) {
- player = player || this._currentPlayer;
+ }
+ setMute(mute, player = this._currentPlayer) {
if (player) {
player.setMute(mute);
}
- };
+ }
- PlaybackManager.prototype.toggleMute = function (mute, player) {
- player = player || this._currentPlayer;
+ toggleMute(mute, player = this._currentPlayer) {
if (player) {
if (player.toggleMute) {
player.toggleMute();
@@ -3227,29 +3228,28 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
player.setMute(!player.isMuted());
}
}
- };
+ }
- PlaybackManager.prototype.toggleDisplayMirroring = function () {
+ toggleDisplayMirroring() {
this.enableDisplayMirroring(!this.enableDisplayMirroring());
- };
+ }
- PlaybackManager.prototype.enableDisplayMirroring = function (enabled) {
+ enableDisplayMirroring(enabled) {
if (enabled != null) {
- var val = enabled ? '1' : '0';
+ const val = enabled ? '1' : '0';
appSettings.set('displaymirror', val);
return;
}
return (appSettings.get('displaymirror') || '') !== '0';
- };
+ }
- PlaybackManager.prototype.nextChapter = function (player) {
- player = player || this._currentPlayer;
- var item = this.currentItem(player);
+ nextChapter(player = this._currentPlayer) {
+ const item = this.currentItem(player);
- var ticks = this.getCurrentTicks(player);
+ const ticks = this.getCurrentTicks(player);
- var nextChapter = (item.Chapters || []).filter(function (i) {
+ const nextChapter = (item.Chapters || []).filter(function (i) {
return i.StartPositionTicks > ticks;
})[0];
@@ -3258,13 +3258,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
} else {
this.nextTrack(player);
}
- };
+ }
- PlaybackManager.prototype.previousChapter = function (player) {
- player = player || this._currentPlayer;
- var item = this.currentItem(player);
+ previousChapter(player = this._currentPlayer) {
+ const item = this.currentItem(player);
- var ticks = this.getCurrentTicks(player);
+ let ticks = this.getCurrentTicks(player);
// Go back 10 seconds
ticks -= 100000000;
@@ -3274,7 +3273,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
ticks = Math.max(ticks, 0);
}
- var previousChapters = (item.Chapters || []).filter(function (i) {
+ const previousChapters = (item.Chapters || []).filter(function (i) {
return i.StartPositionTicks <= ticks;
});
@@ -3283,63 +3282,55 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
} else {
this.previousTrack(player);
}
- };
-
- PlaybackManager.prototype.fastForward = function (player) {
- player = player || this._currentPlayer;
+ }
+ fastForward(player = this._currentPlayer) {
if (player.fastForward != null) {
player.fastForward(userSettings.skipForwardLength());
return;
}
// Go back 15 seconds
- var offsetTicks = userSettings.skipForwardLength() * 10000;
+ const offsetTicks = userSettings.skipForwardLength() * 10000;
this.seekRelative(offsetTicks, player);
- };
-
- PlaybackManager.prototype.rewind = function (player) {
- player = player || this._currentPlayer;
+ }
+ rewind(player = this._currentPlayer) {
if (player.rewind != null) {
player.rewind(userSettings.skipBackLength());
return;
}
// Go back 15 seconds
- var offsetTicks = 0 - (userSettings.skipBackLength() * 10000);
+ const offsetTicks = 0 - (userSettings.skipBackLength() * 10000);
this.seekRelative(offsetTicks, player);
- };
+ }
- PlaybackManager.prototype.seekPercent = function (percent, player) {
- player = player || this._currentPlayer;
-
- var ticks = this.duration(player) || 0;
+ seekPercent(percent, player = this._currentPlayer) {
+ let ticks = this.duration(player) || 0;
percent /= 100;
ticks *= percent;
this.seek(parseInt(ticks), player);
- };
+ }
- PlaybackManager.prototype.seekMs = function (ms, player) {
- player = player || this._currentPlayer;
-
- var ticks = ms * 10000;
+ seekMs(ms, player = this._currentPlayer) {
+ const ticks = ms * 10000;
this.seek(ticks, player);
- };
+ }
- PlaybackManager.prototype.playTrailers = function (item) {
- var player = this._currentPlayer;
+ playTrailers(item) {
+ const player = this._currentPlayer;
if (player && player.playTrailers) {
return player.playTrailers(item);
}
- var apiClient = connectionManager.getApiClient(item.ServerId);
+ const apiClient = connectionManager.getApiClient(item.ServerId);
- var instance = this;
+ const instance = this;
if (item.LocalTrailerCount) {
return apiClient.getLocalTrailers(apiClient.getCurrentUserId(), item.Id).then(function (result) {
@@ -3348,7 +3339,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
});
});
} else {
- var remoteTrailers = item.RemoteTrailers || [];
+ const remoteTrailers = item.RemoteTrailers || [];
if (!remoteTrailers.length) {
return Promise.reject();
@@ -3366,17 +3357,16 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
})
});
}
- };
+ }
- PlaybackManager.prototype.getSubtitleUrl = function (textStream, serverId) {
- var apiClient = connectionManager.getApiClient(serverId);
- var textStreamUrl = !textStream.IsExternalUrl ? apiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
- return textStreamUrl;
- };
+ getSubtitleUrl(textStream, serverId) {
+ const apiClient = connectionManager.getApiClient(serverId);
- PlaybackManager.prototype.stop = function (player) {
+ return !textStream.IsExternalUrl ? apiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
+ }
+
+ stop(player) {
player = player || this._currentPlayer;
-
if (player) {
if (enableLocalPlaylistManagement(player)) {
this._playNextAfterEnded = false;
@@ -3387,11 +3377,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
return Promise.resolve();
- };
-
- PlaybackManager.prototype.getBufferedRanges = function (player) {
- player = player || this._currentPlayer;
+ }
+ getBufferedRanges(player = this._currentPlayer) {
if (player) {
if (player.getBufferedRanges) {
return player.getBufferedRanges();
@@ -3399,11 +3387,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
return [];
- };
-
- PlaybackManager.prototype.playPause = function (player) {
- player = player || this._currentPlayer;
+ }
+ playPause(player = this._currentPlayer) {
if (player) {
if (player.playPause) {
return player.playPause();
@@ -3415,115 +3401,105 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return this.pause(player);
}
}
- };
-
- PlaybackManager.prototype.paused = function (player) {
- player = player || this._currentPlayer;
+ }
+ paused(player = this._currentPlayer) {
if (player) {
return player.paused();
}
- };
-
- PlaybackManager.prototype.pause = function (player) {
- player = player || this._currentPlayer;
+ }
+ pause(player = this._currentPlayer) {
if (player) {
player.pause();
}
- };
-
- PlaybackManager.prototype.unpause = function (player) {
- player = player || this._currentPlayer;
+ }
+ unpause(player = this._currentPlayer) {
if (player) {
player.unpause();
}
- };
+ }
- PlaybackManager.prototype.setPlaybackRate = function (value, player = this._currentPlayer) {
+ setPlaybackRate(value, player = this._currentPlayer) {
if (player && player.setPlaybackRate) {
player.setPlaybackRate(value);
}
- };
+ }
- PlaybackManager.prototype.getPlaybackRate = function (player = this._currentPlayer) {
+ getPlaybackRate(player = this._currentPlayer) {
if (player && player.getPlaybackRate) {
return player.getPlaybackRate();
}
return null;
- };
+ }
- PlaybackManager.prototype.instantMix = function (item, player) {
- player = player || this._currentPlayer;
+ instantMix(item, player = this._currentPlayer) {
if (player && player.instantMix) {
return player.instantMix(item);
}
- var apiClient = connectionManager.getApiClient(item.ServerId);
+ const apiClient = connectionManager.getApiClient(item.ServerId);
- var options = {};
+ const options = {};
options.UserId = apiClient.getCurrentUserId();
options.Limit = 200;
- var instance = this;
+ const instance = this;
apiClient.getInstantMixFromItem(item.Id, options).then(function (result) {
instance.play({
items: result.Items
});
});
- };
+ }
- PlaybackManager.prototype.shuffle = function (shuffleItem, player) {
- player = player || this._currentPlayer;
+ shuffle(shuffleItem, player = this._currentPlayer) {
if (player && player.shuffle) {
return player.shuffle(shuffleItem);
}
return this.play({ items: [shuffleItem], shuffle: true });
- };
+ }
- PlaybackManager.prototype.audioTracks = function (player) {
- player = player || this._currentPlayer;
+ audioTracks(player = this._currentPlayer) {
if (player.audioTracks) {
- var result = player.audioTracks();
+ const result = player.audioTracks();
if (result) {
return result;
}
}
- var mediaSource = this.currentMediaSource(player);
+ const mediaSource = this.currentMediaSource(player);
- var mediaStreams = (mediaSource || {}).MediaStreams || [];
+ const mediaStreams = (mediaSource || {}).MediaStreams || [];
return mediaStreams.filter(function (s) {
return s.Type === 'Audio';
});
- };
+ }
- PlaybackManager.prototype.subtitleTracks = function (player) {
- player = player || this._currentPlayer;
+ subtitleTracks(player = this._currentPlayer) {
if (player.subtitleTracks) {
- var result = player.subtitleTracks();
+ const result = player.subtitleTracks();
if (result) {
return result;
}
}
- var mediaSource = this.currentMediaSource(player);
+ const mediaSource = this.currentMediaSource(player);
- var mediaStreams = (mediaSource || {}).MediaStreams || [];
+ const mediaStreams = (mediaSource || {}).MediaStreams || [];
return mediaStreams.filter(function (s) {
return s.Type === 'Subtitle';
});
- };
+ }
- PlaybackManager.prototype.getSupportedCommands = function (player) {
+ getSupportedCommands(player) {
player = player || this._currentPlayer || { isLocalPlayer: true };
if (player.isLocalPlayer) {
- var list = [
+ const list = [
'GoHome',
'GoToSettings',
'VolumeUp',
@@ -3569,45 +3545,45 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return list;
}
- var info = this.getPlayerInfo();
+ const info = this.getPlayerInfo();
return info ? info.supportedCommands : [];
- };
+ }
- PlaybackManager.prototype.setRepeatMode = function (value, player = this._currentPlayer) {
+ setRepeatMode(value, player = this._currentPlayer) {
if (player && !enableLocalPlaylistManagement(player)) {
return player.setRepeatMode(value);
}
this._playQueueManager.setRepeatMode(value);
events.trigger(player, 'repeatmodechange');
- };
+ }
- PlaybackManager.prototype.getRepeatMode = function (player = this._currentPlayer) {
+ getRepeatMode(player = this._currentPlayer) {
if (player && !enableLocalPlaylistManagement(player)) {
return player.getRepeatMode();
}
return this._playQueueManager.getRepeatMode();
- };
+ }
- PlaybackManager.prototype.setQueueShuffleMode = function (value, player = this._currentPlayer) {
+ setQueueShuffleMode(value, player = this._currentPlayer) {
if (player && !enableLocalPlaylistManagement(player)) {
return player.setQueueShuffleMode(value);
}
this._playQueueManager.setShuffleMode(value);
events.trigger(player, 'shufflequeuemodechange');
- };
+ }
- PlaybackManager.prototype.getQueueShuffleMode = function (player = this._currentPlayer) {
+ getQueueShuffleMode(player = this._currentPlayer) {
if (player && !enableLocalPlaylistManagement(player)) {
return player.getQueueShuffleMode();
}
return this._playQueueManager.getShuffleMode();
- };
+ }
- PlaybackManager.prototype.toggleQueueShuffleMode = function (player = this._currentPlayer) {
+ toggleQueueShuffleMode(player = this._currentPlayer) {
let currentvalue;
if (player && !enableLocalPlaylistManagement(player)) {
currentvalue = player.getQueueShuffleMode();
@@ -3625,23 +3601,23 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
this._playQueueManager.toggleShuffleMode();
}
events.trigger(player, 'shufflequeuemodechange');
- };
+ }
- PlaybackManager.prototype.clearQueue = function (clearCurrentItem = false, player = this._currentPlayer) {
+ clearQueue(clearCurrentItem = false, player = this._currentPlayer) {
if (player && !enableLocalPlaylistManagement(player)) {
return player.clearQueue(clearCurrentItem);
}
this._playQueueManager.clearPlaylist(clearCurrentItem);
events.trigger(player, 'playlistitemremove');
- };
+ }
- PlaybackManager.prototype.trySetActiveDeviceName = function (name) {
+ trySetActiveDeviceName(name) {
name = normalizeName(name);
- var instance = this;
+ const instance = this;
instance.getTargets().then(function (result) {
- var target = result.filter(function (p) {
+ const target = result.filter(function (p) {
return normalizeName(p.name) === name;
})[0];
@@ -3649,50 +3625,49 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
instance.trySetActivePlayer(target.playerName, target);
}
});
- };
+ }
- PlaybackManager.prototype.displayContent = function (options, player) {
- player = player || this._currentPlayer;
+ displayContent(options, player = this._currentPlayer) {
if (player && player.displayContent) {
player.displayContent(options);
}
- };
+ }
- PlaybackManager.prototype.beginPlayerUpdates = function (player) {
+ beginPlayerUpdates(player) {
if (player.beginPlayerUpdates) {
player.beginPlayerUpdates();
}
- };
+ }
- PlaybackManager.prototype.endPlayerUpdates = function (player) {
+ endPlayerUpdates(player) {
if (player.endPlayerUpdates) {
player.endPlayerUpdates();
}
- };
+ }
- PlaybackManager.prototype.setDefaultPlayerActive = function () {
+ setDefaultPlayerActive() {
this.setActivePlayer('localplayer');
- };
+ }
- PlaybackManager.prototype.removeActivePlayer = function (name) {
- var playerInfo = this.getPlayerInfo();
+ removeActivePlayer(name) {
+ const playerInfo = this.getPlayerInfo();
if (playerInfo) {
if (playerInfo.name === name) {
this.setDefaultPlayerActive();
}
}
- };
+ }
- PlaybackManager.prototype.removeActiveTarget = function (id) {
- var playerInfo = this.getPlayerInfo();
+ removeActiveTarget(id) {
+ const playerInfo = this.getPlayerInfo();
if (playerInfo) {
if (playerInfo.id === id) {
this.setDefaultPlayerActive();
}
}
- };
+ }
- PlaybackManager.prototype.sendCommand = function (cmd, player) {
+ sendCommand(cmd, player) {
console.debug('MediaController received command: ' + cmd.Name);
switch (cmd.Name) {
case 'SetRepeatMode':
@@ -3743,7 +3718,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
}
break;
}
- };
+ }
+}
- return new PlaybackManager();
-});
+export default new PlaybackManager();
diff --git a/src/components/playback/playqueuemanager.js b/src/components/playback/playqueuemanager.js
index 696075b344..fbe1ceabfe 100644
--- a/src/components/playback/playqueuemanager.js
+++ b/src/components/playback/playqueuemanager.js
@@ -1,56 +1,56 @@
-define([], function () {
- 'use strict';
+/*eslint prefer-const: "error"*/
- var currentId = 0;
- function addUniquePlaylistItemId(item) {
- if (!item.PlaylistItemId) {
- item.PlaylistItemId = 'playlistItem' + currentId;
- currentId++;
+let currentId = 0;
+function addUniquePlaylistItemId(item) {
+ if (!item.PlaylistItemId) {
+ item.PlaylistItemId = 'playlistItem' + currentId;
+ currentId++;
+ }
+}
+
+function findPlaylistIndex(playlistItemId, list) {
+ for (let i = 0, length = list.length; i < length; i++) {
+ if (list[i].PlaylistItemId === playlistItemId) {
+ return i;
}
}
- function findPlaylistIndex(playlistItemId, list) {
- for (var i = 0, length = list.length; i < length; i++) {
- if (list[i].PlaylistItemId === playlistItemId) {
- return i;
- }
- }
+ return -1;
+}
- return -1;
- }
-
- function PlayQueueManager() {
+class PlayQueueManager {
+ constructor() {
this._sortedPlaylist = [];
this._playlist = [];
this._repeatMode = 'RepeatNone';
this._shuffleMode = 'Sorted';
}
- PlayQueueManager.prototype.getPlaylist = function () {
+ getPlaylist() {
return this._playlist.slice(0);
- };
+ }
- PlayQueueManager.prototype.setPlaylist = function (items) {
+ setPlaylist(items) {
items = items.slice(0);
- for (var i = 0, length = items.length; i < length; i++) {
+ for (let i = 0, length = items.length; i < length; i++) {
addUniquePlaylistItemId(items[i]);
}
this._currentPlaylistItemId = null;
this._playlist = items;
this._repeatMode = 'RepeatNone';
- };
+ }
- PlayQueueManager.prototype.queue = function (items) {
- for (var i = 0, length = items.length; i < length; i++) {
+ queue(items) {
+ for (let i = 0, length = items.length; i < length; i++) {
addUniquePlaylistItemId(items[i]);
this._playlist.push(items[i]);
}
- };
+ }
- PlayQueueManager.prototype.shufflePlaylist = function () {
+ shufflePlaylist() {
this._sortedPlaylist = [];
for (const item of this._playlist) {
this._sortedPlaylist.push(item);
@@ -65,42 +65,31 @@ define([], function () {
}
this._playlist.unshift(currentPlaylistItem);
this._shuffleMode = 'Shuffle';
- };
+ }
- PlayQueueManager.prototype.sortShuffledPlaylist = function () {
+ sortShuffledPlaylist() {
this._playlist = [];
- for (let item of this._sortedPlaylist) {
+ for (const item of this._sortedPlaylist) {
this._playlist.push(item);
}
this._sortedPlaylist = [];
this._shuffleMode = 'Sorted';
- };
+ }
- PlayQueueManager.prototype.clearPlaylist = function (clearCurrentItem = false) {
+ clearPlaylist(clearCurrentItem = false) {
const currentPlaylistItem = this._playlist.splice(this.getCurrentPlaylistIndex(), 1)[0];
this._playlist = [];
if (!clearCurrentItem) {
this._playlist.push(currentPlaylistItem);
}
- };
-
- function arrayInsertAt(destArray, pos, arrayToInsert) {
- var args = [];
- args.push(pos); // where to insert
- args.push(0); // nothing to remove
- args = args.concat(arrayToInsert); // add on array to insert
- destArray.splice.apply(destArray, args); // splice it in
}
- PlayQueueManager.prototype.queueNext = function (items) {
- var i;
- var length;
-
- for (i = 0, length = items.length; i < length; i++) {
+ queueNext(items) {
+ for (let i = 0, length = items.length; i < length; i++) {
addUniquePlaylistItemId(items[i]);
}
- var currentIndex = this.getCurrentPlaylistIndex();
+ let currentIndex = this.getCurrentPlaylistIndex();
if (currentIndex === -1) {
currentIndex = this._playlist.length;
@@ -109,43 +98,43 @@ define([], function () {
}
arrayInsertAt(this._playlist, currentIndex, items);
- };
+ }
- PlayQueueManager.prototype.getCurrentPlaylistIndex = function () {
+ getCurrentPlaylistIndex() {
return findPlaylistIndex(this.getCurrentPlaylistItemId(), this._playlist);
- };
+ }
- PlayQueueManager.prototype.getCurrentItem = function () {
- var index = findPlaylistIndex(this.getCurrentPlaylistItemId(), this._playlist);
+ getCurrentItem() {
+ const index = findPlaylistIndex(this.getCurrentPlaylistItemId(), this._playlist);
return index === -1 ? null : this._playlist[index];
- };
+ }
- PlayQueueManager.prototype.getCurrentPlaylistItemId = function () {
+ getCurrentPlaylistItemId() {
return this._currentPlaylistItemId;
- };
+ }
- PlayQueueManager.prototype.setPlaylistState = function (playlistItemId, playlistIndex) {
+ setPlaylistState(playlistItemId, playlistIndex) {
this._currentPlaylistItemId = playlistItemId;
- };
+ }
- PlayQueueManager.prototype.setPlaylistIndex = function (playlistIndex) {
+ setPlaylistIndex(playlistIndex) {
if (playlistIndex < 0) {
this.setPlaylistState(null);
} else {
this.setPlaylistState(this._playlist[playlistIndex].PlaylistItemId);
}
- };
+ }
- PlayQueueManager.prototype.removeFromPlaylist = function (playlistItemIds) {
+ removeFromPlaylist(playlistItemIds) {
if (this._playlist.length <= playlistItemIds.length) {
return {
result: 'empty'
};
}
- var currentPlaylistItemId = this.getCurrentPlaylistItemId();
- var isCurrentIndex = playlistItemIds.indexOf(currentPlaylistItemId) !== -1;
+ const currentPlaylistItemId = this.getCurrentPlaylistItemId();
+ const isCurrentIndex = playlistItemIds.indexOf(currentPlaylistItemId) !== -1;
this._sortedPlaylist = this._sortedPlaylist.filter(function (item) {
return !playlistItemIds.includes(item.PlaylistItemId);
@@ -159,17 +148,13 @@ define([], function () {
result: 'removed',
isCurrentIndex: isCurrentIndex
};
- };
-
- function moveInArray(array, from, to) {
- array.splice(to, 0, array.splice(from, 1)[0]);
}
- PlayQueueManager.prototype.movePlaylistItem = function (playlistItemId, newIndex) {
- var playlist = this.getPlaylist();
+ movePlaylistItem(playlistItemId, newIndex) {
+ const playlist = this.getPlaylist();
- var oldIndex;
- for (var i = 0, length = playlist.length; i < length; i++) {
+ let oldIndex;
+ for (let i = 0, length = playlist.length; i < length; i++) {
if (playlist[i].PlaylistItemId === playlistItemId) {
oldIndex = i;
break;
@@ -195,30 +180,30 @@ define([], function () {
playlistItemId: playlistItemId,
newIndex: newIndex
};
- };
+ }
- PlayQueueManager.prototype.reset = function () {
+ reset() {
this._sortedPlaylist = [];
this._playlist = [];
this._currentPlaylistItemId = null;
this._repeatMode = 'RepeatNone';
this._shuffleMode = 'Sorted';
- };
+ }
- PlayQueueManager.prototype.setRepeatMode = function (value) {
+ setRepeatMode(value) {
const repeatModes = ['RepeatOne', 'RepeatAll', 'RepeatNone'];
if (repeatModes.includes(value)) {
this._repeatMode = value;
} else {
throw new TypeError('invalid value provided for setRepeatMode');
}
- };
+ }
- PlayQueueManager.prototype.getRepeatMode = function () {
+ getRepeatMode() {
return this._repeatMode;
- };
+ }
- PlayQueueManager.prototype.setShuffleMode = function (value) {
+ setShuffleMode(value) {
switch (value) {
case 'Shuffle':
this.shufflePlaylist();
@@ -229,9 +214,9 @@ define([], function () {
default:
throw new TypeError('invalid value provided to setShuffleMode');
}
- };
+ }
- PlayQueueManager.prototype.toggleShuffleMode = function () {
+ toggleShuffleMode() {
switch (this._shuffleMode) {
case 'Shuffle':
this.setShuffleMode('Sorted');
@@ -242,16 +227,16 @@ define([], function () {
default:
throw new TypeError('current value for shufflequeue is invalid');
}
- };
+ }
- PlayQueueManager.prototype.getShuffleMode = function () {
+ getShuffleMode() {
return this._shuffleMode;
- };
+ }
- PlayQueueManager.prototype.getNextItemInfo = function () {
- var newIndex;
- var playlist = this.getPlaylist();
- var playlistLength = playlist.length;
+ getNextItemInfo() {
+ let newIndex;
+ const playlist = this.getPlaylist();
+ const playlistLength = playlist.length;
switch (this.getRepeatMode()) {
case 'RepeatOne':
@@ -272,7 +257,7 @@ define([], function () {
return null;
}
- var item = playlist[newIndex];
+ const item = playlist[newIndex];
if (!item) {
return null;
@@ -282,7 +267,19 @@ define([], function () {
item: item,
index: newIndex
};
- };
+ }
+}
- return PlayQueueManager;
-});
+function arrayInsertAt(destArray, pos, arrayToInsert) {
+ let args = [];
+ args.push(pos); // where to insert
+ args.push(0); // nothing to remove
+ args = args.concat(arrayToInsert); // add on array to insert
+ destArray.splice.apply(destArray, args); // splice it in
+}
+
+function moveInArray(array, from, to) {
+ array.splice(to, 0, array.splice(from, 1)[0]);
+}
+
+export default PlayQueueManager;
diff --git a/src/components/playbackSettings/playbackSettings.template.html b/src/components/playbackSettings/playbackSettings.template.html
index 03af5d6faa..700215223d 100644
--- a/src/components/playbackSettings/playbackSettings.template.html
+++ b/src/components/playbackSettings/playbackSettings.template.html
@@ -85,7 +85,7 @@
diff --git a/src/components/recordingcreator/recordingcreator.js b/src/components/recordingcreator/recordingcreator.js
index f330e54156..ca5c475829 100644
--- a/src/components/recordingcreator/recordingcreator.js
+++ b/src/components/recordingcreator/recordingcreator.js
@@ -104,7 +104,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
var apiClient = connectionManager.getApiClient(serverId);
apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId()).then(function (item) {
- playbackManager.play({
+ playbackManager.default.play({
ids: [item.ChannelId],
serverId: serverId
});
diff --git a/src/components/recordingcreator/recordingeditor.js b/src/components/recordingcreator/recordingeditor.js
index 3797cde370..2086129a9e 100644
--- a/src/components/recordingcreator/recordingeditor.js
+++ b/src/components/recordingcreator/recordingeditor.js
@@ -1,6 +1,8 @@
define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'connectionManager', 'require', 'loading', 'scrollHelper', 'imageLoader', 'scrollStyles', 'emby-button', 'emby-collapse', 'emby-input', 'paper-icon-button-light', 'css!./../formdialog', 'css!./recordingcreator', 'material-icons', 'flexStyles'], function (dialogHelper, globalize, layoutManager, mediaInfo, appHost, connectionManager, require, loading, scrollHelper, imageLoader) {
'use strict';
+ loading = loading.default || loading;
+
var currentDialog;
var recordingDeleted = false;
var currentItemId;
diff --git a/src/components/recordingcreator/recordingfields.js b/src/components/recordingcreator/recordingfields.js
index 2534eafe6a..e3739f1cfe 100644
--- a/src/components/recordingcreator/recordingfields.js
+++ b/src/components/recordingcreator/recordingfields.js
@@ -1,6 +1,8 @@
define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loading', 'apphost', 'dom', 'recordingHelper', 'events', 'paper-icon-button-light', 'emby-button', 'css!./recordingfields', 'flexStyles'], function (globalize, connectionManager, serverNotifications, require, loading, appHost, dom, recordingHelper, events) {
'use strict';
+ loading = loading.default || loading;
+
function loadData(parent, program, apiClient) {
if (program.IsSeries) {
parent.querySelector('.recordSeriesContainer').classList.remove('hide');
diff --git a/src/components/recordingcreator/recordinghelper.js b/src/components/recordingcreator/recordinghelper.js
index 4a0bdd9b01..5d72394282 100644
--- a/src/components/recordingcreator/recordinghelper.js
+++ b/src/components/recordingcreator/recordinghelper.js
@@ -1,6 +1,8 @@
define(['globalize', 'loading', 'connectionManager'], function (globalize, loading, connectionManager) {
'use strict';
+ loading = loading.default || loading;
+
function changeRecordingToSeries(apiClient, timerId, programId, confirmTimerCancellation) {
loading.show();
diff --git a/src/components/recordingcreator/seriesrecordingeditor.js b/src/components/recordingcreator/seriesrecordingeditor.js
index ea20c7267d..b115e273e6 100644
--- a/src/components/recordingcreator/seriesrecordingeditor.js
+++ b/src/components/recordingcreator/seriesrecordingeditor.js
@@ -1,6 +1,8 @@
define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'connectionManager', 'require', 'loading', 'scrollHelper', 'imageLoader', 'datetime', 'scrollStyles', 'emby-button', 'emby-checkbox', 'emby-input', 'emby-select', 'paper-icon-button-light', 'css!./../formdialog', 'css!./recordingcreator', 'material-icons', 'flexStyles'], function (dialogHelper, globalize, layoutManager, mediaInfo, appHost, connectionManager, require, loading, scrollHelper, imageLoader, datetime) {
'use strict';
+ loading = loading.default || loading;
+
var currentDialog;
var recordingUpdated = false;
var recordingDeleted = false;
diff --git a/src/components/refreshdialog/refreshdialog.js b/src/components/refreshdialog/refreshdialog.js
index 40e1183502..1ec0517448 100644
--- a/src/components/refreshdialog/refreshdialog.js
+++ b/src/components/refreshdialog/refreshdialog.js
@@ -1,94 +1,108 @@
-define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionManager', 'appRouter', 'globalize', 'emby-input', 'emby-checkbox', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button'], function (dom, shell, dialogHelper, loading, layoutManager, connectionManager, appRouter, globalize) {
- 'use strict';
+import dom from 'dom';
+import dialogHelper from 'dialogHelper';
+import loading from 'loading';
+import layoutManager from 'layoutManager';
+import connectionManager from 'connectionManager';
+import globalize from 'globalize';
+import 'emby-input';
+import 'emby-checkbox';
+import 'paper-icon-button-light';
+import 'emby-select';
+import 'material-icons';
+import 'css!./../formdialog';
+import 'emby-button';
- function getEditorHtml() {
- var html = '';
+/*eslint prefer-const: "error"*/
- html += '
';
- html += '
';
- html += '
';
+ html += '
';
+ html += '
';
- function centerFocus(elem, horiz, on) {
- require(['scrollHelper'], function (scrollHelper) {
- var fn = on ? 'on' : 'off';
- scrollHelper.centerFocus[fn](elem, horiz);
+ return html;
+}
+
+function centerFocus(elem, horiz, on) {
+ import('scrollHelper').then(({default: scrollHelper}) => {
+ const fn = on ? 'on' : 'off';
+ scrollHelper.centerFocus[fn](elem, horiz);
+ });
+}
+
+function onSubmit(e) {
+ loading.show();
+
+ const instance = this;
+ const dlg = dom.parentWithClass(e.target, 'dialog');
+ const options = instance.options;
+
+ const apiClient = connectionManager.getApiClient(options.serverId);
+
+ const replaceAllMetadata = dlg.querySelector('#selectMetadataRefreshMode').value === 'all';
+
+ const mode = dlg.querySelector('#selectMetadataRefreshMode').value === 'scan' ? 'Default' : 'FullRefresh';
+ const replaceAllImages = mode === 'FullRefresh' && dlg.querySelector('.chkReplaceImages').checked;
+
+ options.itemIds.forEach(function (itemId) {
+ apiClient.refreshItem(itemId, {
+
+ Recursive: true,
+ ImageRefreshMode: mode,
+ MetadataRefreshMode: mode,
+ ReplaceAllImages: replaceAllImages,
+ ReplaceAllMetadata: replaceAllMetadata
});
- }
+ });
- function onSubmit(e) {
- loading.show();
+ dialogHelper.close(dlg);
- var instance = this;
- var dlg = dom.parentWithClass(e.target, 'dialog');
- var options = instance.options;
+ import('toast').then(({default: toast}) => {
+ toast(globalize.translate('RefreshQueued'));
+ });
- var apiClient = connectionManager.getApiClient(options.serverId);
+ loading.hide();
- var replaceAllMetadata = dlg.querySelector('#selectMetadataRefreshMode').value === 'all';
+ e.preventDefault();
+ return false;
+}
- var mode = dlg.querySelector('#selectMetadataRefreshMode').value === 'scan' ? 'Default' : 'FullRefresh';
- var replaceAllImages = mode === 'FullRefresh' && dlg.querySelector('.chkReplaceImages').checked;
-
- options.itemIds.forEach(function (itemId) {
- apiClient.refreshItem(itemId, {
-
- Recursive: true,
- ImageRefreshMode: mode,
- MetadataRefreshMode: mode,
- ReplaceAllImages: replaceAllImages,
- ReplaceAllMetadata: replaceAllMetadata
- });
- });
-
- dialogHelper.close(dlg);
-
- require(['toast'], function (toast) {
- toast(globalize.translate('RefreshQueued'));
- });
-
- loading.hide();
-
- e.preventDefault();
- return false;
- }
-
- function RefreshDialog(options) {
+class RefreshDialog {
+ constructor(options) {
this.options = options;
}
- RefreshDialog.prototype.show = function () {
- var dialogOptions = {
+ show() {
+ const dialogOptions = {
removeOnClose: true,
scrollY: false
};
@@ -99,12 +113,12 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionM
dialogOptions.size = 'small';
}
- var dlg = dialogHelper.createDialog(dialogOptions);
+ const dlg = dialogHelper.createDialog(dialogOptions);
dlg.classList.add('formDialog');
- var html = '';
- var title = globalize.translate('RefreshMetadata');
+ let html = '';
+ const title = globalize.translate('RefreshMetadata');
html += '';
html += '
';
diff --git a/src/controllers/edititemmetadata.js b/src/controllers/edititemmetadata.js
index 1a3647a758..b0f1f4a142 100644
--- a/src/controllers/edititemmetadata.js
+++ b/src/controllers/edititemmetadata.js
@@ -1,6 +1,8 @@
define(['loading', 'scripts/editorsidebar'], function (loading) {
'use strict';
+ loading = loading.default || loading;
+
function reload(context, itemId) {
loading.show();
diff --git a/src/controllers/favorites.js b/src/controllers/favorites.js
index 51c4301a71..74cf186729 100644
--- a/src/controllers/favorites.js
+++ b/src/controllers/favorites.js
@@ -147,11 +147,11 @@ define(['appRouter', 'cardBuilder', 'dom', 'globalize', 'connectionManager', 'ap
options.Limit = 20;
var userId = apiClient.getCurrentUserId();
- if ('MusicArtist' === section.types) {
+ if (section.types === 'MusicArtist') {
return apiClient.getArtists(userId, options);
}
- if ('Person' === section.types) {
+ if (section.types === 'Person') {
return apiClient.getPeople(userId, options);
}
@@ -198,7 +198,7 @@ define(['appRouter', 'cardBuilder', 'dom', 'globalize', 'connectionManager', 'ap
preferThumb: section.preferThumb,
shape: section.shape,
centerText: section.centerText && !cardLayout,
- overlayText: false !== section.overlayText,
+ overlayText: section.overlayText !== false,
showTitle: section.showTitle,
showYear: section.showYear,
showParentTitle: section.showParentTitle,
diff --git a/src/controllers/home.js b/src/controllers/home.js
index 9a4cea2227..3396a7336f 100644
--- a/src/controllers/home.js
+++ b/src/controllers/home.js
@@ -20,7 +20,7 @@ define(['tabbedView', 'globalize', 'require', 'emby-tabs', 'emby-button', 'emby-
}
function getTabController(index) {
- if (null == index) {
+ if (index == null) {
throw new Error('index cannot be null');
}
diff --git a/src/controllers/hometab.js b/src/controllers/hometab.js
index 8e2a1f92e7..97034d4505 100644
--- a/src/controllers/hometab.js
+++ b/src/controllers/hometab.js
@@ -1,6 +1,8 @@
define(['userSettings', 'loading', 'connectionManager', 'apphost', 'layoutManager', 'focusManager', 'homeSections', 'emby-itemscontainer'], function (userSettings, loading, connectionManager, appHost, layoutManager, focusManager, homeSections) {
'use strict';
+ loading = loading.default || loading;
+
function HomeTab(view, params) {
this.view = view;
this.params = params;
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index 29aa8ad1e1..df2855d69a 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -1,8 +1,36 @@
-define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSettings', 'cardBuilder', 'datetime', 'mediaInfo', 'backdrop', 'listView', 'itemContextMenu', 'itemHelper', 'dom', 'indicators', 'imageLoader', 'libraryMenu', 'globalize', 'browser', 'events', 'playbackManager', 'scrollStyles', 'emby-itemscontainer', 'emby-checkbox', 'emby-button', 'emby-playstatebutton', 'emby-ratingbutton', 'emby-scroller', 'emby-select'], function (loading, appRouter, layoutManager, connectionManager, userSettings, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, dom, indicators, imageLoader, libraryMenu, globalize, browser, events, playbackManager) {
- 'use strict';
+import loading from 'loading';
+import appRouter from 'appRouter';
+import layoutManager from 'layoutManager';
+import connectionManager from 'connectionManager';
+import * as userSettings from 'userSettings';
+import cardBuilder from 'cardBuilder';
+import datetime from 'datetime';
+import mediaInfo from 'mediaInfo';
+import backdrop from 'backdrop';
+import listView from 'listView';
+import itemContextMenu from 'itemContextMenu';
+import itemHelper from 'itemHelper';
+import dom from 'dom';
+import indicators from 'indicators';
+import imageLoader from 'imageLoader';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+import browser from 'browser';
+import events from 'events';
+import playbackManager from 'playbackManager';
+import 'scrollStyles';
+import 'emby-itemscontainer';
+import 'emby-checkbox';
+import 'emby-button';
+import 'emby-playstatebutton';
+import 'emby-ratingbutton';
+import 'emby-scroller';
+import 'emby-select';
+
+/* eslint-disable indent */
function getPromise(apiClient, params) {
- var id = params.id;
+ const id = params.id;
if (id) {
return apiClient.getItem(apiClient.getCurrentUserId(), id);
@@ -38,7 +66,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function getContextMenuOptions(item, user, button) {
- var options = {
+ return {
item: item,
open: false,
play: false,
@@ -53,12 +81,10 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
user: user,
share: true
};
-
- return options;
}
function getProgramScheduleHtml(items) {
- var html = '';
+ let html = '';
html += '
';
html += listView.getListViewHtml({
@@ -94,15 +120,15 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
result.Items = [];
}
- var html = getProgramScheduleHtml(result.Items);
- var scheduleTab = page.querySelector('.seriesTimerSchedule');
+ const html = getProgramScheduleHtml(result.Items);
+ const scheduleTab = page.querySelector('.seriesTimerSchedule');
scheduleTab.innerHTML = html;
imageLoader.lazyChildren(scheduleTab);
});
}
function renderTimerEditor(page, item, apiClient, user) {
- if ('Recording' !== item.Type || !user.Policy.EnableLiveTvManagement || !item.TimerId || 'InProgress' !== item.Status) {
+ if (item.Type !== 'Recording' || !user.Policy.EnableLiveTvManagement || !item.TimerId || item.Status !== 'InProgress') {
return void hideAll(page, 'btnCancelTimer');
}
@@ -110,12 +136,12 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderSeriesTimerEditor(page, item, apiClient, user) {
- if ('SeriesTimer' !== item.Type) {
+ if (item.Type !== 'SeriesTimer') {
return void hideAll(page, 'btnCancelSeriesTimer');
}
if (user.Policy.EnableLiveTvManagement) {
- require(['seriesRecordingEditor'], function (seriesRecordingEditor) {
+ import('seriesRecordingEditor').then(({default: seriesRecordingEditor}) => {
seriesRecordingEditor.embed(item, apiClient.serverId(), {
context: page.querySelector('.seriesRecordingEditor')
});
@@ -131,9 +157,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderTrackSelections(page, instance, item, forceReload) {
- var select = page.querySelector('.selectSource');
+ const select = page.querySelector('.selectSource');
- if (!item.MediaSources || !itemHelper.supportsMediaSourceSelection(item) || -1 === playbackManager.getSupportedCommands().indexOf('PlayMediaSource') || !playbackManager.canPlay(item)) {
+ if (!item.MediaSources || !itemHelper.supportsMediaSourceSelection(item) || playbackManager.getSupportedCommands().indexOf('PlayMediaSource') === -1 || !playbackManager.canPlay(item)) {
page.querySelector('.trackSelections').classList.add('hide');
select.innerHTML = '';
page.querySelector('.selectVideo').innerHTML = '';
@@ -142,17 +168,17 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
return;
}
- var mediaSources = item.MediaSources;
+ const mediaSources = item.MediaSources;
instance._currentPlaybackMediaSources = mediaSources;
page.querySelector('.trackSelections').classList.remove('hide');
select.setLabel(globalize.translate('LabelVersion'));
- var currentValue = select.value;
+ const currentValue = select.value;
- var selectedId = mediaSources[0].Id;
+ const selectedId = mediaSources[0].Id;
select.innerHTML = mediaSources.map(function (v) {
- var selected = v.Id === selectedId ? ' selected' : '';
+ const selected = v.Id === selectedId ? ' selected' : '';
return '
';
}).join('');
@@ -170,22 +196,22 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderVideoSelections(page, mediaSources) {
- var mediaSourceId = page.querySelector('.selectSource').value;
- var mediaSource = mediaSources.filter(function (m) {
+ const mediaSourceId = page.querySelector('.selectSource').value;
+ const mediaSource = mediaSources.filter(function (m) {
return m.Id === mediaSourceId;
})[0];
- var tracks = mediaSource.MediaStreams.filter(function (m) {
+ const tracks = mediaSource.MediaStreams.filter(function (m) {
return m.Type === 'Video';
});
- var select = page.querySelector('.selectVideo');
+ const select = page.querySelector('.selectVideo');
select.setLabel(globalize.translate('LabelVideo'));
- var selectedId = tracks.length ? tracks[0].Index : -1;
+ const selectedId = tracks.length ? tracks[0].Index : -1;
select.innerHTML = tracks.map(function (v) {
- var selected = v.Index === selectedId ? ' selected' : '';
- var titleParts = [];
- var resolutionText = mediaInfo.getResolutionText(v);
+ const selected = v.Index === selectedId ? ' selected' : '';
+ const titleParts = [];
+ const resolutionText = mediaInfo.getResolutionText(v);
if (resolutionText) {
titleParts.push(resolutionText);
@@ -207,18 +233,18 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderAudioSelections(page, mediaSources) {
- var mediaSourceId = page.querySelector('.selectSource').value;
- var mediaSource = mediaSources.filter(function (m) {
+ const mediaSourceId = page.querySelector('.selectSource').value;
+ const mediaSource = mediaSources.filter(function (m) {
return m.Id === mediaSourceId;
})[0];
- var tracks = mediaSource.MediaStreams.filter(function (m) {
- return 'Audio' === m.Type;
+ const tracks = mediaSource.MediaStreams.filter(function (m) {
+ return m.Type === 'Audio';
});
- var select = page.querySelector('.selectAudio');
+ const select = page.querySelector('.selectAudio');
select.setLabel(globalize.translate('LabelAudio'));
- var selectedId = mediaSource.DefaultAudioStreamIndex;
+ const selectedId = mediaSource.DefaultAudioStreamIndex;
select.innerHTML = tracks.map(function (v) {
- var selected = v.Index === selectedId ? ' selected' : '';
+ const selected = v.Index === selectedId ? ' selected' : '';
return '
';
}).join('');
@@ -236,24 +262,24 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderSubtitleSelections(page, mediaSources) {
- var mediaSourceId = page.querySelector('.selectSource').value;
- var mediaSource = mediaSources.filter(function (m) {
+ const mediaSourceId = page.querySelector('.selectSource').value;
+ const mediaSource = mediaSources.filter(function (m) {
return m.Id === mediaSourceId;
})[0];
- var tracks = mediaSource.MediaStreams.filter(function (m) {
- return 'Subtitle' === m.Type;
+ const tracks = mediaSource.MediaStreams.filter(function (m) {
+ return m.Type === 'Subtitle';
});
- var select = page.querySelector('.selectSubtitles');
+ const select = page.querySelector('.selectSubtitles');
select.setLabel(globalize.translate('LabelSubtitles'));
- var selectedId = null == mediaSource.DefaultSubtitleStreamIndex ? -1 : mediaSource.DefaultSubtitleStreamIndex;
+ const selectedId = mediaSource.DefaultSubtitleStreamIndex == null ? -1 : mediaSource.DefaultSubtitleStreamIndex;
- var videoTracks = mediaSource.MediaStreams.filter(function (m) {
- return 'Video' === m.Type;
+ const videoTracks = mediaSource.MediaStreams.filter(function (m) {
+ return m.Type === 'Video';
});
// This only makes sense on Video items
if (videoTracks.length) {
- var selected = -1 === selectedId ? ' selected' : '';
+ let selected = selectedId === -1 ? ' selected' : '';
select.innerHTML = '
' + tracks.map(function (v) {
selected = v.Index === selectedId ? ' selected' : '';
return '
';
@@ -273,10 +299,10 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function reloadPlayButtons(page, item) {
- var canPlay = false;
+ let canPlay = false;
- if ('Program' == item.Type) {
- var now = new Date();
+ if (item.Type == 'Program') {
+ const now = new Date();
if (now >= datetime.parseISO8601Date(item.StartDate, true) && now < datetime.parseISO8601Date(item.EndDate, true)) {
hideAll(page, 'btnPlay', true);
@@ -290,9 +316,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
hideAll(page, 'btnShuffle');
} else if (playbackManager.canPlay(item)) {
hideAll(page, 'btnPlay', true);
- var enableInstantMix = -1 !== ['Audio', 'MusicAlbum', 'MusicGenre', 'MusicArtist'].indexOf(item.Type);
+ const enableInstantMix = ['Audio', 'MusicAlbum', 'MusicGenre', 'MusicArtist'].indexOf(item.Type) !== -1;
hideAll(page, 'btnInstantMix', enableInstantMix);
- var enableShuffle = item.IsFolder || -1 !== ['MusicAlbum', 'MusicGenre', 'MusicArtist'].indexOf(item.Type);
+ const enableShuffle = item.IsFolder || ['MusicAlbum', 'MusicGenre', 'MusicArtist'].indexOf(item.Type) !== -1;
hideAll(page, 'btnShuffle', enableShuffle);
canPlay = true;
@@ -315,12 +341,12 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function reloadUserDataButtons(page, item) {
- var i;
- var length;
- var btnPlaystates = page.querySelectorAll('.btnPlaystate');
+ let i;
+ let length;
+ const btnPlaystates = page.querySelectorAll('.btnPlaystate');
for (i = 0, length = btnPlaystates.length; i < length; i++) {
- var btnPlaystate = btnPlaystates[i];
+ const btnPlaystate = btnPlaystates[i];
if (itemHelper.canMarkPlayed(item)) {
btnPlaystate.classList.remove('hide');
@@ -331,10 +357,10 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
}
- var btnUserRatings = page.querySelectorAll('.btnUserRating');
+ const btnUserRatings = page.querySelectorAll('.btnUserRating');
for (i = 0, length = btnUserRatings.length; i < length; i++) {
- var btnUserRating = btnUserRatings[i];
+ const btnUserRating = btnUserRatings[i];
if (itemHelper.canRate(item)) {
btnUserRating.classList.remove('hide');
@@ -347,19 +373,18 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function getArtistLinksHtml(artists, serverId, context) {
- var html = [];
+ let html = [];
for (const artist of artists) {
- var href = appRouter.getRouteUrl(artist, {
+ const href = appRouter.getRouteUrl(artist, {
context: context,
itemType: 'MusicArtist',
serverId: serverId
});
html.push('
' + artist.Name + '');
}
- html = html.join(' / ');
- return html;
+ return html.join(' / ');
}
/**
@@ -369,17 +394,17 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
* @param {Object} context - Application context.
*/
function renderName(item, container, context) {
- var parentRoute;
- var parentNameHtml = [];
- var parentNameLast = false;
+ let parentRoute;
+ const parentNameHtml = [];
+ let parentNameLast = false;
if (item.AlbumArtists) {
parentNameHtml.push(getArtistLinksHtml(item.AlbumArtists, item.ServerId, context));
parentNameLast = true;
- } else if (item.ArtistItems && item.ArtistItems.length && 'MusicVideo' === item.Type) {
+ } else if (item.ArtistItems && item.ArtistItems.length && item.Type === 'MusicVideo') {
parentNameHtml.push(getArtistLinksHtml(item.ArtistItems, item.ServerId, context));
parentNameLast = true;
- } else if (item.SeriesName && 'Episode' === item.Type) {
+ } else if (item.SeriesName && item.Type === 'Episode') {
parentRoute = appRouter.getRouteUrl({
Id: item.SeriesId,
Name: item.SeriesName,
@@ -394,7 +419,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
parentNameHtml.push(item.Name);
}
- if (item.SeriesName && 'Season' === item.Type) {
+ if (item.SeriesName && item.Type === 'Season') {
parentRoute = appRouter.getRouteUrl({
Id: item.SeriesId,
Name: item.SeriesName,
@@ -405,7 +430,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
context: context
});
parentNameHtml.push('
' + item.SeriesName + '');
- } else if (null != item.ParentIndexNumber && 'Episode' === item.Type) {
+ } else if (item.ParentIndexNumber != null && item.Type === 'Episode') {
parentRoute = appRouter.getRouteUrl({
Id: item.SeasonId,
Name: item.SeasonName,
@@ -416,9 +441,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
context: context
});
parentNameHtml.push('
' + item.SeasonName + '');
- } else if (null != item.ParentIndexNumber && item.IsSeries) {
+ } else if (item.ParentIndexNumber != null && item.IsSeries) {
parentNameHtml.push(item.SeasonName || 'S' + item.ParentIndexNumber);
- } else if (item.Album && item.AlbumId && ('MusicVideo' === item.Type || 'Audio' === item.Type)) {
+ } else if (item.Album && item.AlbumId && (item.Type === 'MusicVideo' || item.Type === 'Audio')) {
parentRoute = appRouter.getRouteUrl({
Id: item.AlbumId,
Name: item.Album,
@@ -434,9 +459,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
// FIXME: This whole section needs some refactoring, so it becames easier to scale across all form factors. See GH #1022
- var html = '';
- var tvShowHtml = parentNameHtml[0];
- var tvSeasonHtml = parentNameHtml[1];
+ let html = '';
+ const tvShowHtml = parentNameHtml[0];
+ const tvSeasonHtml = parentNameHtml[1];
if (parentNameHtml.length) {
if (parentNameLast) {
@@ -451,7 +476,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
}
- var name = itemHelper.getDisplayName(item, {
+ const name = itemHelper.getDisplayName(item, {
includeParentInfo: false
});
@@ -481,7 +506,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function setTrailerButtonVisibility(page, item) {
- if ((item.LocalTrailerCount || item.RemoteTrailers && item.RemoteTrailers.length) && -1 !== playbackManager.getSupportedCommands().indexOf('PlayTrailers')) {
+ if ((item.LocalTrailerCount || item.RemoteTrailers && item.RemoteTrailers.length) && playbackManager.getSupportedCommands().indexOf('PlayTrailers') !== -1) {
hideAll(page, 'btnPlayTrailer', true);
} else {
hideAll(page, 'btnPlayTrailer');
@@ -497,9 +522,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderDetailPageBackdrop(page, item, apiClient) {
- var imgUrl;
- var hasbackdrop = false;
- var itemBackdropElement = page.querySelector('#itemBackdrop');
+ let imgUrl;
+ let hasbackdrop = false;
+ const itemBackdropElement = page.querySelector('#itemBackdrop');
if (!layoutManager.mobile && !userSettings.detailsBanner()) {
return false;
@@ -523,6 +548,14 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
});
imageLoader.lazyImage(itemBackdropElement, imgUrl);
hasbackdrop = true;
+ } else if (item.ImageTags && item.ImageTags.Primary) {
+ imgUrl = apiClient.getScaledImageUrl(item.Id, {
+ type: 'Primary',
+ maxWidth: dom.getScreenWidth(),
+ tag: item.ImageTags.Primary
+ });
+ imageLoader.lazyImage(itemBackdropElement, imgUrl);
+ hasbackdrop = true;
} else {
itemBackdropElement.style.backgroundImage = '';
}
@@ -550,9 +583,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
renderSeriesTimerEditor(page, item, apiClient, user);
renderTimerEditor(page, item, apiClient, user);
setInitialCollapsibleState(page, item, apiClient, params.context, user);
- var canPlay = reloadPlayButtons(page, item);
+ const canPlay = reloadPlayButtons(page, item);
- if ((item.LocalTrailerCount || item.RemoteTrailers && item.RemoteTrailers.length) && -1 !== playbackManager.getSupportedCommands().indexOf('PlayTrailers')) {
+ if ((item.LocalTrailerCount || item.RemoteTrailers && item.RemoteTrailers.length) && playbackManager.getSupportedCommands().indexOf('PlayTrailers') !== -1) {
hideAll(page, 'btnPlayTrailer', true);
} else {
hideAll(page, 'btnPlayTrailer');
@@ -560,15 +593,15 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
setTrailerButtonVisibility(page, item);
- if ('Program' !== item.Type || canPlay) {
+ if (item.Type !== 'Program' || canPlay) {
hideAll(page, 'mainDetailButtons', true);
} else {
hideAll(page, 'mainDetailButtons');
}
showRecordingFields(instance, page, item, user);
- var groupedVersions = (item.MediaSources || []).filter(function (g) {
- return 'Grouping' == g.Type;
+ const groupedVersions = (item.MediaSources || []).filter(function (g) {
+ return g.Type == 'Grouping';
});
if (user.Policy.IsAdministrator && groupedVersions.length) {
@@ -583,11 +616,11 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
hideAll(page, 'btnMoreCommands');
}
- var itemBirthday = page.querySelector('#itemBirthday');
+ const itemBirthday = page.querySelector('#itemBirthday');
- if ('Person' == item.Type && item.PremiereDate) {
+ if (item.Type == 'Person' && item.PremiereDate) {
try {
- var birthday = datetime.parseISO8601Date(item.PremiereDate, true).toDateString();
+ const birthday = datetime.parseISO8601Date(item.PremiereDate, true).toDateString();
itemBirthday.classList.remove('hide');
itemBirthday.innerHTML = globalize.translate('BirthDateValue', birthday);
} catch (err) {
@@ -597,11 +630,11 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
itemBirthday.classList.add('hide');
}
- var itemDeathDate = page.querySelector('#itemDeathDate');
+ const itemDeathDate = page.querySelector('#itemDeathDate');
- if ('Person' == item.Type && item.EndDate) {
+ if (item.Type == 'Person' && item.EndDate) {
try {
- var deathday = datetime.parseISO8601Date(item.EndDate, true).toDateString();
+ const deathday = datetime.parseISO8601Date(item.EndDate, true).toDateString();
itemDeathDate.classList.remove('hide');
itemDeathDate.innerHTML = globalize.translate('DeathDateValue', deathday);
} catch (err) {
@@ -611,10 +644,10 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
itemDeathDate.classList.add('hide');
}
- var itemBirthLocation = page.querySelector('#itemBirthLocation');
+ const itemBirthLocation = page.querySelector('#itemBirthLocation');
- if ('Person' == item.Type && item.ProductionLocations && item.ProductionLocations.length) {
- var gmap = '
' + item.ProductionLocations[0] + '';
+ if (item.Type == 'Person' && item.ProductionLocations && item.ProductionLocations.length) {
+ const gmap = '
' + item.ProductionLocations[0] + '';
itemBirthLocation.classList.remove('hide');
itemBirthLocation.innerHTML = globalize.translate('BirthPlaceValue', gmap);
} else {
@@ -628,7 +661,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
hideAll(page, 'btnDownload', true);
}
- require(['autoFocuser'], function (autoFocuser) {
+ import('autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(page);
});
}
@@ -651,9 +684,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderLogo(page, item, apiClient) {
- var detailLogo = page.querySelector('.detailLogo');
+ const detailLogo = page.querySelector('.detailLogo');
- var url = logoImageUrl(item, apiClient, {});
+ const url = logoImageUrl(item, apiClient, {});
if (!layoutManager.mobile && !userSettings.enableBackdrops()) {
detailLogo.classList.add('hide');
@@ -667,10 +700,10 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
function showRecordingFields(instance, page, item, user) {
if (!instance.currentRecordingFields) {
- var recordingFieldsElement = page.querySelector('.recordingFields');
+ const recordingFieldsElement = page.querySelector('.recordingFields');
- if ('Program' == item.Type && user.Policy.EnableLiveTvManagement) {
- require(['recordingFields'], function (recordingFields) {
+ if (item.Type == 'Program' && user.Policy.EnableLiveTvManagement) {
+ import('recordingFields').then(({default: recordingFields}) => {
instance.currentRecordingFields = new recordingFields({
parent: recordingFieldsElement,
programId: item.Id,
@@ -686,9 +719,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderLinks(page, item) {
- var externalLinksElem = page.querySelector('.itemExternalLinks');
+ const externalLinksElem = page.querySelector('.itemExternalLinks');
- var links = [];
+ const links = [];
if (!layoutManager.tv && item.HomePageUrl) {
links.push(`
${globalize.translate('ButtonWebsite')}`);
@@ -700,7 +733,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
}
- var html = [];
+ const html = [];
if (links.length) {
html.push(links.join(', '));
}
@@ -726,7 +759,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
disableIndicators: true,
disableHoverMenu: true,
overlayPlayButton: true,
- width: dom.getWindowSize().innerWidth * 0.5
+ width: dom.getWindowSize().innerWidth * 0.25
});
elem.innerHTML = cardHtml;
@@ -750,7 +783,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function setPeopleHeader(page, item) {
- if ('Audio' == item.MediaType || 'MusicAlbum' == item.Type || 'Book' == item.MediaType || 'Photo' == item.MediaType) {
+ if (item.MediaType == 'Audio' || item.Type == 'MusicAlbum' || item.MediaType == 'Book' || item.MediaType == 'Photo') {
page.querySelector('#peopleHeader').innerHTML = globalize.translate('HeaderPeople');
} else {
page.querySelector('#peopleHeader').innerHTML = globalize.translate('HeaderCastAndCrew');
@@ -758,9 +791,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderNextUp(page, item, user) {
- var section = page.querySelector('.nextUpSection');
+ const section = page.querySelector('.nextUpSection');
- if ('Series' != item.Type) {
+ if (item.Type != 'Series') {
return void section.classList.add('hide');
}
@@ -774,16 +807,16 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
section.classList.add('hide');
}
- var html = cardBuilder.getCardsHtml({
+ const html = cardBuilder.getCardsHtml({
items: result.Items,
shape: 'overflowBackdrop',
showTitle: true,
- displayAsSpecial: 'Season' == item.Type && item.IndexNumber,
+ displayAsSpecial: item.Type == 'Season' && item.IndexNumber,
overlayText: false,
centerText: true,
overlayPlayButton: true
});
- var itemsContainer = section.querySelector('.nextUpItems');
+ const itemsContainer = section.querySelector('.nextUpItems');
itemsContainer.innerHTML = html;
imageLoader.lazyChildren(itemsContainer);
});
@@ -792,14 +825,14 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
function setInitialCollapsibleState(page, item, apiClient, context, user) {
page.querySelector('.collectionItems').innerHTML = '';
- if ('Playlist' == item.Type) {
+ if (item.Type == 'Playlist') {
page.querySelector('#childrenCollapsible').classList.remove('hide');
renderPlaylistItems(page, item);
- } else if ('Studio' == item.Type || 'Person' == item.Type || 'Genre' == item.Type || 'MusicGenre' == item.Type || 'MusicArtist' == item.Type) {
+ } else if (item.Type == 'Studio' || item.Type == 'Person' || item.Type == 'Genre' || item.Type == 'MusicGenre' || item.Type == 'MusicArtist') {
page.querySelector('#childrenCollapsible').classList.remove('hide');
renderItemsByName(page, item);
} else if (item.IsFolder) {
- if ('BoxSet' == item.Type) {
+ if (item.Type == 'BoxSet') {
page.querySelector('#childrenCollapsible').classList.add('hide');
}
@@ -808,7 +841,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
page.querySelector('#childrenCollapsible').classList.add('hide');
}
- if ('Series' == item.Type) {
+ if (item.Type == 'Series') {
renderSeriesSchedule(page, item);
renderNextUp(page, item, user);
} else {
@@ -817,7 +850,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
renderScenes(page, item);
- if (item.SpecialFeatureCount && 0 != item.SpecialFeatureCount && 'Series' != item.Type) {
+ if (item.SpecialFeatureCount && item.SpecialFeatureCount != 0 && item.Type != 'Series') {
page.querySelector('#specialsCollapsible').classList.remove('hide');
renderSpecials(page, item, user);
} else {
@@ -833,7 +866,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
page.querySelector('#additionalPartsCollapsible').classList.add('hide');
}
- if ('MusicAlbum' == item.Type) {
+ if (item.Type == 'MusicAlbum') {
renderMusicVideos(page, item, user);
} else {
page.querySelector('#musicVideosCollapsible').classList.add('hide');
@@ -841,8 +874,8 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function toggleLineClamp(clampTarget, e) {
- var expandButton = e.target;
- var clampClassName = 'detail-clamp-text';
+ const expandButton = e.target;
+ const clampClassName = 'detail-clamp-text';
if (clampTarget.classList.contains(clampClassName)) {
clampTarget.classList.remove(clampClassName);
@@ -855,7 +888,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
function renderOverview(page, item) {
for (const overviewElemnt of page.querySelectorAll('.overview')) {
- var overview = item.Overview || '';
+ const overview = item.Overview || '';
if (overview) {
overviewElemnt.innerHTML = overview;
@@ -863,7 +896,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
overviewElemnt.classList.add('detail-clamp-text');
// Grab the sibling element to control the expand state
- var expandButton = overviewElemnt.parentElement.querySelector('.overview-expand');
+ const expandButton = overviewElemnt.parentElement.querySelector('.overview-expand');
// Detect if we have overflow of text. Based on this StackOverflow answer
// https://stackoverflow.com/a/35157976
@@ -886,10 +919,10 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderGenres(page, item, context = inferContext(item)) {
- var genres = item.GenreItems || [];
- var type = context === 'music' ? 'MusicGenre' : 'Genre';
+ const genres = item.GenreItems || [];
+ const type = context === 'music' ? 'MusicGenre' : 'Genre';
- var html = genres.map(function (p) {
+ const html = genres.map(function (p) {
return '
' + p.Name + '';
}).join(', ');
- var genresLabel = page.querySelector('.genresLabel');
+ const genresLabel = page.querySelector('.genresLabel');
genresLabel.innerHTML = globalize.translate(genres.length > 1 ? 'Genres' : 'Genre');
- var genresValue = page.querySelector('.genres');
+ const genresValue = page.querySelector('.genres');
genresValue.innerHTML = html;
- var genresGroup = page.querySelector('.genresGroup');
+ const genresGroup = page.querySelector('.genresGroup');
if (genres.length) {
genresGroup.classList.remove('hide');
} else {
@@ -914,11 +947,11 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderWriter(page, item, context) {
- var writers = (item.People || []).filter(function (person) {
+ const writers = (item.People || []).filter(function (person) {
return person.Type === 'Writer';
});
- var html = writers.map(function (person) {
+ const html = writers.map(function (person) {
return '
' + person.Name + '';
}).join(', ');
- var writersLabel = page.querySelector('.writersLabel');
+ const writersLabel = page.querySelector('.writersLabel');
writersLabel.innerHTML = globalize.translate(writers.length > 1 ? 'Writers' : 'Writer');
- var writersValue = page.querySelector('.writers');
+ const writersValue = page.querySelector('.writers');
writersValue.innerHTML = html;
- var writersGroup = page.querySelector('.writersGroup');
+ const writersGroup = page.querySelector('.writersGroup');
if (writers.length) {
writersGroup.classList.remove('hide');
} else {
@@ -943,11 +976,11 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderDirector(page, item, context) {
- var directors = (item.People || []).filter(function (person) {
+ const directors = (item.People || []).filter(function (person) {
return person.Type === 'Director';
});
- var html = directors.map(function (person) {
+ const html = directors.map(function (person) {
return '
' + person.Name + '';
}).join(', ');
- var directorsLabel = page.querySelector('.directorsLabel');
+ const directorsLabel = page.querySelector('.directorsLabel');
directorsLabel.innerHTML = globalize.translate(directors.length > 1 ? 'Directors' : 'Director');
- var directorsValue = page.querySelector('.directors');
+ const directorsValue = page.querySelector('.directors');
directorsValue.innerHTML = html;
- var directorsGroup = page.querySelector('.directorsGroup');
+ const directorsGroup = page.querySelector('.directorsGroup');
if (directors.length) {
directorsGroup.classList.remove('hide');
} else {
@@ -981,7 +1014,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
subtitles: false
});
- if (miscInfo.innerHTML && 'SeriesTimer' !== item.Type) {
+ if (miscInfo.innerHTML && item.Type !== 'SeriesTimer') {
miscInfo.classList.remove('hide');
} else {
miscInfo.classList.add('hide');
@@ -995,7 +1028,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
interactive: true
});
- if (miscInfo.innerHTML && 'SeriesTimer' !== item.Type) {
+ if (miscInfo.innerHTML && item.Type !== 'SeriesTimer') {
miscInfo.classList.remove('hide');
} else {
miscInfo.classList.add('hide');
@@ -1004,7 +1037,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderTagline(page, item) {
- var taglineElement = page.querySelector('.tagline');
+ const taglineElement = page.querySelector('.tagline');
if (item.Taglines && item.Taglines.length) {
taglineElement.classList.remove('hide');
@@ -1036,7 +1069,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function getPortraitShape(scrollX) {
- if (null == scrollX) {
+ if (scrollX == null) {
scrollX = enableScrollX();
}
@@ -1044,7 +1077,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function getSquareShape(scrollX) {
- if (null == scrollX) {
+ if (scrollX == null) {
scrollX = enableScrollX();
}
@@ -1052,14 +1085,14 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderMoreFromSeason(view, item, apiClient) {
- var section = view.querySelector('.moreFromSeasonSection');
+ const section = view.querySelector('.moreFromSeasonSection');
if (section) {
- if ('Episode' !== item.Type || !item.SeasonId || !item.SeriesId) {
+ if (item.Type !== 'Episode' || !item.SeasonId || !item.SeriesId) {
return void section.classList.add('hide');
}
- var userId = apiClient.getCurrentUserId();
+ const userId = apiClient.getCurrentUserId();
apiClient.getEpisodes(item.SeriesId, {
SeasonId: item.SeasonId,
UserId: userId,
@@ -1071,7 +1104,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
section.classList.remove('hide');
section.querySelector('h2').innerHTML = globalize.translate('MoreFromValue', item.SeasonName);
- var itemsContainer = section.querySelector('.itemsContainer');
+ const itemsContainer = section.querySelector('.itemsContainer');
cardBuilder.buildCards(result.Items, {
parentContainer: section,
itemsContainer: itemsContainer,
@@ -1084,7 +1117,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
includeParentInfoInTitle: false,
allowBottomPadding: false
});
- var card = itemsContainer.querySelector('.card[data-id="' + item.Id + '"]');
+ const card = itemsContainer.querySelector('.card[data-id="' + item.Id + '"]');
if (card) {
setTimeout(function () {
@@ -1096,18 +1129,18 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderMoreFromArtist(view, item, apiClient) {
- var section = view.querySelector('.moreFromArtistSection');
+ const section = view.querySelector('.moreFromArtistSection');
if (section) {
- if ('MusicArtist' === item.Type) {
+ if (item.Type === 'MusicArtist') {
if (!apiClient.isMinServerVersion('3.4.1.19')) {
return void section.classList.add('hide');
}
- } else if ('MusicAlbum' !== item.Type || !item.AlbumArtists || !item.AlbumArtists.length) {
+ } else if (item.Type !== 'MusicAlbum' || !item.AlbumArtists || !item.AlbumArtists.length) {
return void section.classList.add('hide');
}
- var query = {
+ const query = {
IncludeItemTypes: 'MusicAlbum',
Recursive: true,
ExcludeItemIds: item.Id,
@@ -1115,7 +1148,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
SortOrder: 'Descending'
};
- if ('MusicArtist' === item.Type) {
+ if (item.Type === 'MusicArtist') {
query.ContributingArtistIds = item.Id;
} else if (apiClient.isMinServerVersion('3.4.1.18')) {
query.AlbumArtistIds = item.AlbumArtists[0].Id;
@@ -1130,7 +1163,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
section.classList.remove('hide');
- if ('MusicArtist' === item.Type) {
+ if (item.Type === 'MusicArtist') {
section.querySelector('h2').innerHTML = globalize.translate('HeaderAppearsOn');
} else {
section.querySelector('h2').innerHTML = globalize.translate('MoreFromValue', item.AlbumArtists[0].Name);
@@ -1142,7 +1175,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
shape: 'autooverflow',
sectionTitleTagName: 'h2',
scalable: true,
- coverImage: 'MusicArtist' === item.Type || 'MusicAlbum' === item.Type,
+ coverImage: item.Type === 'MusicArtist' || item.Type === 'MusicAlbum',
showTitle: true,
showParentTitle: false,
centerText: true,
@@ -1155,22 +1188,22 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderSimilarItems(page, item, context) {
- var similarCollapsible = page.querySelector('#similarCollapsible');
+ const similarCollapsible = page.querySelector('#similarCollapsible');
if (similarCollapsible) {
- if ('Movie' != item.Type && 'Trailer' != item.Type && 'Series' != item.Type && 'Program' != item.Type && 'Recording' != item.Type && 'MusicAlbum' != item.Type && 'MusicArtist' != item.Type && 'Playlist' != item.Type) {
+ if (item.Type != 'Movie' && item.Type != 'Trailer' && item.Type != 'Series' && item.Type != 'Program' && item.Type != 'Recording' && item.Type != 'MusicAlbum' && item.Type != 'MusicArtist' && item.Type != 'Playlist') {
return void similarCollapsible.classList.add('hide');
}
similarCollapsible.classList.remove('hide');
- var apiClient = connectionManager.getApiClient(item.ServerId);
- var options = {
+ const apiClient = connectionManager.getApiClient(item.ServerId);
+ const options = {
userId: apiClient.getCurrentUserId(),
limit: 12,
fields: 'PrimaryImageAspectRatio,UserData,CanDelete'
};
- if ('MusicAlbum' == item.Type && item.AlbumArtists && item.AlbumArtists.length) {
+ if (item.Type == 'MusicAlbum' && item.AlbumArtists && item.AlbumArtists.length) {
options.ExcludeArtistIds = item.AlbumArtists[0].Id;
}
@@ -1180,22 +1213,22 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
similarCollapsible.classList.remove('hide');
- var html = '';
+ let html = '';
html += cardBuilder.getCardsHtml({
items: result.Items,
shape: 'autooverflow',
- showParentTitle: 'MusicAlbum' == item.Type,
+ showParentTitle: item.Type == 'MusicAlbum',
centerText: true,
showTitle: true,
context: context,
lazy: true,
showDetailsMenu: true,
- coverImage: 'MusicAlbum' == item.Type || 'MusicArtist' == item.Type,
+ coverImage: item.Type == 'MusicAlbum' || item.Type == 'MusicArtist',
overlayPlayButton: true,
overlayText: false,
- showYear: 'Movie' === item.Type || 'Trailer' === item.Type || 'Series' === item.Type
+ showYear: item.Type === 'Movie' || item.Type === 'Trailer' || item.Type === 'Series'
});
- var similarContent = similarCollapsible.querySelector('.similarContent');
+ const similarContent = similarCollapsible.querySelector('.similarContent');
similarContent.innerHTML = html;
imageLoader.lazyChildren(similarContent);
});
@@ -1203,14 +1236,14 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderSeriesAirTime(page, item, isStatic) {
- var seriesAirTime = page.querySelector('#seriesAirTime');
- if ('Series' != item.Type) {
+ const seriesAirTime = page.querySelector('#seriesAirTime');
+ if (item.Type != 'Series') {
seriesAirTime.classList.add('hide');
return;
}
- var html = '';
+ let html = '';
if (item.AirDays && item.AirDays.length) {
- if (7 == item.AirDays.length) {
+ if (item.AirDays.length == 7) {
html += 'daily';
} else {
html += item.AirDays.map(function (a) {
@@ -1225,8 +1258,8 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
if (isStatic) {
html += ' on ' + item.Studios[0].Name;
} else {
- var context = inferContext(item);
- var href = appRouter.getRouteUrl(item.Studios[0], {
+ const context = inferContext(item);
+ const href = appRouter.getRouteUrl(item.Studios[0], {
context: context,
itemType: 'Studio',
serverId: item.ServerId
@@ -1235,7 +1268,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
}
if (html) {
- html = ('Ended' == item.Status ? 'Aired ' : 'Airs ') + html;
+ html = (item.Status == 'Ended' ? 'Aired ' : 'Airs ') + html;
seriesAirTime.innerHTML = html;
seriesAirTime.classList.remove('hide');
} else {
@@ -1244,15 +1277,15 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderTags(page, item) {
- var itemTags = page.querySelector('.itemTags');
- var tagElements = [];
- var tags = item.Tags || [];
+ const itemTags = page.querySelector('.itemTags');
+ const tagElements = [];
+ let tags = item.Tags || [];
- if ('Program' === item.Type) {
+ if (item.Type === 'Program') {
tags = [];
}
- for (var i = 0, length = tags.length; i < length; i++) {
+ for (let i = 0, length = tags.length; i < length; i++) {
tagElements.push(tags[i]);
}
@@ -1266,44 +1299,44 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderChildren(page, item) {
- var fields = 'ItemCounts,PrimaryImageAspectRatio,BasicSyncInfo,CanDelete,MediaSourceCount';
- var query = {
+ let fields = 'ItemCounts,PrimaryImageAspectRatio,BasicSyncInfo,CanDelete,MediaSourceCount';
+ const query = {
ParentId: item.Id,
Fields: fields
};
- if ('BoxSet' !== item.Type) {
+ if (item.Type !== 'BoxSet') {
query.SortBy = 'SortName';
}
- var promise;
- var apiClient = connectionManager.getApiClient(item.ServerId);
- var userId = apiClient.getCurrentUserId();
+ let promise;
+ const apiClient = connectionManager.getApiClient(item.ServerId);
+ const userId = apiClient.getCurrentUserId();
- if ('Series' == item.Type) {
+ if (item.Type == 'Series') {
promise = apiClient.getSeasons(item.Id, {
userId: userId,
Fields: fields
});
- } else if ('Season' == item.Type) {
+ } else if (item.Type == 'Season') {
fields += ',Overview';
promise = apiClient.getEpisodes(item.SeriesId, {
seasonId: item.Id,
userId: userId,
Fields: fields
});
- } else if ('MusicArtist' == item.Type) {
+ } else if (item.Type == 'MusicArtist') {
query.SortBy = 'ProductionYear,SortName';
}
promise = promise || apiClient.getItems(apiClient.getCurrentUserId(), query);
promise.then(function (result) {
- var html = '';
- var scrollX = false;
- var isList = false;
- var childrenItemsContainer = page.querySelector('.childrenItemsContainer');
+ let html = '';
+ let scrollX = false;
+ let isList = false;
+ const childrenItemsContainer = page.querySelector('.childrenItemsContainer');
- if ('MusicAlbum' == item.Type) {
+ if (item.Type == 'MusicAlbum') {
html = listView.getListViewHtml({
items: result.Items,
smallIcon: true,
@@ -1317,7 +1350,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
containerAlbumArtists: item.AlbumArtists
});
isList = true;
- } else if ('Series' == item.Type) {
+ } else if (item.Type == 'Series') {
scrollX = enableScrollX();
html = cardBuilder.getCardsHtml({
items: result.Items,
@@ -1328,21 +1361,21 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
overlayPlayButton: true,
allowBottomPadding: !scrollX
});
- } else if ('Season' == item.Type || 'Episode' == item.Type) {
- if ('Episode' !== item.Type) {
+ } else if (item.Type == 'Season' || item.Type == 'Episode') {
+ if (item.Type !== 'Episode') {
isList = true;
}
- scrollX = 'Episode' == item.Type;
- if (result.Items.length < 2 && 'Episode' === item.Type) {
+ scrollX = item.Type == 'Episode';
+ if (result.Items.length < 2 && item.Type === 'Episode') {
return;
}
- if ('Episode' === item.Type) {
+ if (item.Type === 'Episode') {
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: 'overflowBackdrop',
showTitle: true,
- displayAsSpecial: 'Season' == item.Type && item.IndexNumber,
+ displayAsSpecial: item.Type == 'Season' && item.IndexNumber,
playFromHere: true,
overlayText: true,
lazy: true,
@@ -1351,7 +1384,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
allowBottomPadding: !scrollX,
includeParentInfoInTitle: false
});
- } else if ('Season' === item.Type) {
+ } else if (item.Type === 'Season') {
html = listView.getListViewHtml({
items: result.Items,
showIndexNumber: false,
@@ -1368,7 +1401,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
}
- if ('BoxSet' !== item.Type) {
+ if (item.Type !== 'BoxSet') {
page.querySelector('#childrenCollapsible').classList.remove('hide');
}
if (scrollX) {
@@ -1393,8 +1426,8 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
childrenItemsContainer.innerHTML = html;
imageLoader.lazyChildren(childrenItemsContainer);
- if ('BoxSet' == item.Type) {
- var collectionItemTypes = [{
+ if (item.Type == 'BoxSet') {
+ const collectionItemTypes = [{
name: globalize.translate('HeaderVideos'),
mediaType: 'Video'
}, {
@@ -1411,17 +1444,17 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
});
- if ('Season' == item.Type) {
+ if (item.Type == 'Season') {
page.querySelector('#childrenTitle').innerHTML = globalize.translate('HeaderEpisodes');
- } else if ('Series' == item.Type) {
+ } else if (item.Type == 'Series') {
page.querySelector('#childrenTitle').innerHTML = globalize.translate('HeaderSeasons');
- } else if ('MusicAlbum' == item.Type) {
+ } else if (item.Type == 'MusicAlbum') {
page.querySelector('#childrenTitle').innerHTML = globalize.translate('HeaderTracks');
} else {
page.querySelector('#childrenTitle').innerHTML = globalize.translate('HeaderItems');
}
- if ('MusicAlbum' == item.Type || 'Season' == item.Type) {
+ if (item.Type == 'MusicAlbum' || item.Type == 'Season') {
page.querySelector('.childrenSectionHeader').classList.add('hide');
page.querySelector('#childrenCollapsible').classList.add('verticalSection-extrabottompadding');
} else {
@@ -1430,25 +1463,25 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderItemsByName(page, item) {
- require('scripts/itembynamedetailpage'.split(','), function () {
+ import('scripts/itembynamedetailpage').then(() => {
window.ItemsByName.renderItems(page, item);
});
}
function renderPlaylistItems(page, item) {
- require('scripts/playlistedit'.split(','), function () {
+ import('scripts/playlistedit').then(() => {
PlaylistViewer.render(page, item);
});
}
function renderProgramsForChannel(page, result) {
- var html = '';
- var currentItems = [];
- var currentStartDate = null;
+ let html = '';
+ let currentItems = [];
+ let currentStartDate = null;
- for (var i = 0, length = result.Items.length; i < length; i++) {
- var item = result.Items[i];
- var itemStartDate = datetime.parseISO8601Date(item.StartDate);
+ for (let i = 0, length = result.Items.length; i < length; i++) {
+ const item = result.Items[i];
+ const itemStartDate = datetime.parseISO8601Date(item.StartDate);
if (!(currentStartDate && currentStartDate.toDateString() === itemStartDate.toDateString())) {
if (currentItems.length) {
@@ -1498,7 +1531,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderChannelGuide(page, apiClient, item) {
- if ('TvChannel' === item.Type) {
+ if (item.Type === 'TvChannel') {
page.querySelector('.programGuideSection').classList.remove('hide');
apiClient.getLiveTvPrograms({
ChannelIds: item.Id,
@@ -1516,7 +1549,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderSeriesSchedule(page, item) {
- var apiClient = connectionManager.getApiClient(item.ServerId);
+ const apiClient = connectionManager.getApiClient(item.ServerId);
apiClient.getLiveTvPrograms({
UserId: apiClient.getCurrentUserId(),
HasAired: false,
@@ -1550,19 +1583,19 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function inferContext(item) {
- if ('Movie' === item.Type || 'BoxSet' === item.Type) {
+ if (item.Type === 'Movie' || item.Type === 'BoxSet') {
return 'movies';
}
- if ('Series' === item.Type || 'Season' === item.Type || 'Episode' === item.Type) {
+ if (item.Type === 'Series' || item.Type === 'Season' || item.Type === 'Episode') {
return 'tvshows';
}
- if ('MusicArtist' === item.Type || 'MusicAlbum' === item.Type || 'Audio' === item.Type || 'AudioBook' === item.Type) {
+ if (item.Type === 'MusicArtist' || item.Type === 'MusicAlbum' || item.Type === 'Audio' || item.Type === 'AudioBook') {
return 'music';
}
- if ('Program' === item.Type) {
+ if (item.Type === 'Program') {
return 'livetv';
}
@@ -1580,9 +1613,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function canPlaySomeItemInCollection(items) {
- var i = 0;
+ let i = 0;
- for (var length = items.length; i < length; i++) {
+ for (let length = items.length; i < length; i++) {
if (playbackManager.canPlay(items[i])) {
return true;
}
@@ -1596,17 +1629,17 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
page.querySelector('.collectionItems').innerHTML = '';
for (const type of types) {
- var typeItems = filterItemsByCollectionItemType(items, type);
+ const typeItems = filterItemsByCollectionItemType(items, type);
if (typeItems.length) {
renderCollectionItemType(page, parentItem, type, typeItems);
}
}
- var otherType = {
+ const otherType = {
name: globalize.translate('HeaderOtherItems')
};
- var otherTypeItems = items.filter(function (curr) {
+ const otherTypeItems = items.filter(function (curr) {
return !types.filter(function (t) {
return filterItemsByCollectionItemType([curr], t).length > 0;
}).length;
@@ -1622,9 +1655,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}, items);
}
- var containers = page.querySelectorAll('.collectionItemsContainer');
+ const containers = page.querySelectorAll('.collectionItemsContainer');
- var notifyRefreshNeeded = function () {
+ const notifyRefreshNeeded = function () {
renderChildren(page, parentItem);
};
@@ -1640,13 +1673,13 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
// HACK: Call autoFocuser again because btnPlay may be hidden, but focused by reloadFromItem
// FIXME: Sometimes focus does not move until all (?) sections are loaded
- require(['autoFocuser'], function (autoFocuser) {
+ import('autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(page);
});
}
function renderCollectionItemType(page, parentItem, type, items) {
- var html = '';
+ let html = '';
html += '
';
html += '
';
html += '
';
@@ -1654,12 +1687,12 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
html += '
';
html += '';
html += '
';
- var 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,
@@ -1670,7 +1703,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
});
html += '
';
html += '
';
- var collectionItems = page.querySelector('.collectionItems');
+ const collectionItems = page.querySelector('.collectionItems');
collectionItems.insertAdjacentHTML('beforeend', html);
imageLoader.lazyChildren(collectionItems);
}
@@ -1686,7 +1719,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}).then(function (result) {
if (result.Items.length) {
page.querySelector('#musicVideosCollapsible').classList.remove('hide');
- var musicVideosContent = page.querySelector('.musicVideosContent');
+ const musicVideosContent = page.querySelector('.musicVideosContent');
musicVideosContent.innerHTML = getVideosHtml(result.Items);
imageLoader.lazyChildren(musicVideosContent);
} else {
@@ -1699,7 +1732,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
connectionManager.getApiClient(item.ServerId).getAdditionalVideoParts(user.Id, item.Id).then(function (result) {
if (result.Items.length) {
page.querySelector('#additionalPartsCollapsible').classList.remove('hide');
- var additionalPartsContent = page.querySelector('#additionalPartsContent');
+ const additionalPartsContent = page.querySelector('#additionalPartsContent');
additionalPartsContent.innerHTML = getVideosHtml(result.Items);
imageLoader.lazyChildren(additionalPartsContent);
} else {
@@ -1709,13 +1742,13 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function renderScenes(page, item) {
- var chapters = item.Chapters || [];
+ let chapters = item.Chapters || [];
if (chapters.length && !chapters[0].ImageTag && (chapters = []), chapters.length) {
page.querySelector('#scenesCollapsible').classList.remove('hide');
- var scenesContent = page.querySelector('#scenesContent');
+ const scenesContent = page.querySelector('#scenesContent');
- require(['chaptercardbuilder'], function (chaptercardbuilder) {
+ import('chaptercardbuilder').then(({default: chaptercardbuilder}) => {
chaptercardbuilder.buildChapterCards(item, chapters, {
itemsContainer: scenesContent,
backdropShape: 'overflowBackdrop',
@@ -1729,7 +1762,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function getVideosHtml(items) {
- var html = cardBuilder.getCardsHtml({
+ return cardBuilder.getCardsHtml({
items: items,
shape: 'autooverflow',
showTitle: true,
@@ -1738,20 +1771,18 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
centerText: true,
showRuntime: true
});
-
- return html;
}
function renderSpecials(page, item, user) {
connectionManager.getApiClient(item.ServerId).getSpecialFeatures(user.Id, item.Id).then(function (specials) {
- var specialsContent = page.querySelector('#specialsContent');
+ const specialsContent = page.querySelector('#specialsContent');
specialsContent.innerHTML = getVideosHtml(specials);
imageLoader.lazyChildren(specialsContent);
});
}
function renderCast(page, item) {
- var people = (item.People || []).filter(function (p) {
+ const people = (item.People || []).filter(function (p) {
return p.Type === 'Actor';
});
@@ -1760,9 +1791,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
page.querySelector('#castCollapsible').classList.remove('hide');
- var castContent = page.querySelector('#castContent');
+ const castContent = page.querySelector('#castContent');
- require(['peoplecardbuilder'], function (peoplecardbuilder) {
+ import('peoplecardbuilder').then(({default: peoplecardbuilder}) => {
peoplecardbuilder.buildPeopleCards(people, {
itemsContainer: castContent,
coverImage: true,
@@ -1774,14 +1805,14 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function itemDetailPage() {
- var self = this;
+ const self = this;
self.setInitialCollapsibleState = setInitialCollapsibleState;
self.renderDetails = renderDetails;
self.renderCast = renderCast;
}
function bindAll(view, selector, eventName, fn) {
- var elems = view.querySelectorAll(selector);
+ const elems = view.querySelectorAll(selector);
for (const elem of elems) {
elem.addEventListener(eventName, fn);
@@ -1794,11 +1825,12 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
window.ItemDetailPage = new itemDetailPage();
- return function (view, params) {
+
+ export default function (view, params) {
function reload(instance, page, params) {
loading.show();
- var apiClient = params.serverId ? connectionManager.getApiClient(params.serverId) : ApiClient;
+ const apiClient = params.serverId ? connectionManager.getApiClient(params.serverId) : ApiClient;
Promise.all([getPromise(apiClient, params), apiClient.getCurrentUser()]).then(([item, user]) => {
currentItem = item;
@@ -1809,8 +1841,8 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function splitVersions(instance, page, apiClient, params) {
- require(['confirm'], function (confirm) {
- confirm.default('Are you sure you wish to split the media sources into separate items?', 'Split Media Apart').then(function () {
+ import('confirm').then(({default: confirm}) => {
+ confirm('Are you sure you wish to split the media sources into separate items?', 'Split Media Apart').then(function () {
loading.show();
apiClient.ajax({
type: 'DELETE',
@@ -1824,7 +1856,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function getPlayOptions(startPosition) {
- var audioStreamIndex = view.querySelector('.selectAudio').value || null;
+ const audioStreamIndex = view.querySelector('.selectAudio').value || null;
return {
startPositionTicks: startPosition,
mediaSourceId: view.querySelector('.selectSource').value,
@@ -1834,7 +1866,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function playItem(item, startPosition) {
- var playOptions = getPlayOptions(startPosition);
+ const playOptions = getPlayOptions(startPosition);
playOptions.items = [item];
playbackManager.play(playOptions);
}
@@ -1844,10 +1876,10 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function playCurrentItem(button, mode) {
- var item = currentItem;
+ const item = currentItem;
- if ('Program' === item.Type) {
- var apiClient = connectionManager.getApiClient(item.ServerId);
+ if (item.Type === 'Program') {
+ const apiClient = connectionManager.getApiClient(item.ServerId);
return void apiClient.getLiveTvChannel(item.ChannelId, apiClient.getCurrentUserId()).then(function (channel) {
playbackManager.play({
items: [channel]
@@ -1871,7 +1903,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function onCancelSeriesTimerClick() {
- require(['recordingHelper'], function (recordingHelper) {
+ import('recordingHelper').then(({default: recordingHelper}) => {
recordingHelper.cancelSeriesTimerWithConfirmation(currentItem.Id, currentItem.ServerId).then(function () {
Dashboard.navigate('livetv.html');
});
@@ -1879,7 +1911,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function onCancelTimerClick() {
- require(['recordingHelper'], function (recordingHelper) {
+ import('recordingHelper').then(({default: recordingHelper}) => {
recordingHelper.cancelTimer(connectionManager.getApiClient(currentItem.ServerId), currentItem.TimerId).then(function () {
reload(self, view, params);
});
@@ -1891,8 +1923,8 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function onDownloadClick() {
- require(['fileDownloader'], function (fileDownloader) {
- var downloadHref = apiClient.getItemDownloadUrl(currentItem.Id);
+ import('fileDownloader').then(({default: fileDownloader}) => {
+ const downloadHref = apiClient.getItemDownloadUrl(currentItem.Id);
fileDownloader.download([{
url: downloadHref,
itemId: currentItem.Id,
@@ -1902,7 +1934,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function onMoreCommandsClick() {
- var button = this;
+ const button = this;
apiClient.getCurrentUser().then(function (user) {
itemContextMenu.show(getContextMenuOptions(currentItem, user, button)).then(function (result) {
if (result.deleted) {
@@ -1920,11 +1952,11 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
function onWebSocketMessage(e, data) {
- var msg = data;
+ const msg = data;
- if ('UserDataChanged' === msg.MessageType && currentItem && msg.Data.UserId == apiClient.getCurrentUserId()) {
- var key = currentItem.UserData.Key;
- var userData = msg.Data.UserDataList.filter(function (u) {
+ 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;
})[0];
@@ -1936,9 +1968,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
}
}
- var currentItem;
- var self = this;
- var apiClient = params.serverId ? connectionManager.getApiClient(params.serverId) : ApiClient;
+ let currentItem;
+ const self = this;
+ const apiClient = params.serverId ? connectionManager.getApiClient(params.serverId) : ApiClient;
view.querySelectorAll('.btnPlay');
bindAll(view, '.btnPlay', 'click', onPlayClick);
bindAll(view, '.btnResume', 'click', onPlayClick);
@@ -1959,7 +1991,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
renderSubtitleSelections(view, self._currentPlaybackMediaSources);
});
view.addEventListener('viewshow', function (e) {
- var page = this;
+ const page = this;
libraryMenu.setTransparentMenu(true);
@@ -1985,5 +2017,6 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
self._currentPlaybackMediaSources = null;
self.currentRecordingFields = null;
});
- };
-});
+ }
+
+/* eslint-enable indent */
diff --git a/src/controllers/list.js b/src/controllers/list.js
index aea791c167..7dab6f5f35 100644
--- a/src/controllers/list.js
+++ b/src/controllers/list.js
@@ -14,6 +14,9 @@ import 'emby-scroller';
/* eslint-disable indent */
+ playbackManager = playbackManager.default || playbackManager;
+ loading = loading.default || loading;
+
function getInitialLiveTvQuery(instance, params) {
const query = {
UserId: connectionManager.getApiClient(params.serverId).getCurrentUserId(),
@@ -22,7 +25,7 @@ import 'emby-scroller';
Limit: 300
};
- if ('Recordings' === params.type) {
+ if (params.type === 'Recordings') {
query.IsInProgress = false;
} else {
query.HasAired = false;
@@ -32,39 +35,39 @@ import 'emby-scroller';
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;
}
@@ -194,13 +197,13 @@ import 'emby-scroller';
const 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 {
@@ -216,11 +219,11 @@ import 'emby-scroller';
if (alphaPicker) {
const 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 {
@@ -235,19 +238,19 @@ import 'emby-scroller';
const 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',
@@ -263,9 +266,9 @@ import 'emby-scroller';
instance.queryRecursive = true;
let method = 'getItems';
- if ('MusicArtist' === params.type) {
+ if (params.type === 'MusicArtist') {
method = 'getArtists';
- } else if ('Person' === params.type) {
+ } else if (params.type === 'Person') {
method = 'getPeople';
}
@@ -274,15 +277,15 @@ import 'emby-scroller';
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;
const query = {
StartIndex: startIndex,
@@ -293,25 +296,25 @@ import 'emby-scroller';
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;
}
@@ -329,7 +332,7 @@ import 'emby-scroller';
}
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);
}
@@ -426,7 +429,7 @@ class ItemsView {
constructor(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;
}
@@ -438,7 +441,7 @@ class ItemsView {
function getItemsHtml(items) {
const settings = self.getViewSettings();
- if ('list' === settings.imageType) {
+ if (settings.imageType === 'list') {
return listView.getListViewHtml({
items: items
});
@@ -452,24 +455,24 @@ class ItemsView {
const item = self.currentItem;
let 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';
}
@@ -487,46 +490,46 @@ class ItemsView {
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;
- const showParentTitle = settings.showTitle && 'true' !== params.IsMovie;
+ const showParentTitle = settings.showTitle && params.IsMovie !== 'true';
if (showParentTitle) {
lines++;
}
- const showAirTime = settings.showTitle && 'Recordings' !== params.type;
+ const showAirTime = settings.showTitle && params.type !== 'Recordings';
if (showAirTime) {
lines++;
}
- const showYear = settings.showTitle && 'true' === params.IsMovie && 'Recordings' === params.type;
-
+ const 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,
@@ -543,7 +546,7 @@ class ItemsView {
posterOptions.lines = lines;
posterOptions.items = items;
- if (item && 'folders' === item.CollectionType) {
+ if (item && item.CollectionType === 'folders') {
posterOptions.context = 'folders';
}
@@ -575,7 +578,7 @@ class ItemsView {
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);
@@ -583,43 +586,43 @@ class ItemsView {
}
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');
}
@@ -627,35 +630,35 @@ class ItemsView {
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');
}
@@ -714,11 +717,11 @@ class ItemsView {
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');
}
@@ -751,7 +754,7 @@ class ItemsView {
const sortButton = sortButtons[i];
sortButton.addEventListener('click', showSortMenu.bind(this));
- if ('nextup' !== params.type) {
+ if (params.type !== 'nextup') {
sortButton.classList.remove('hide');
}
}
@@ -786,19 +789,19 @@ class ItemsView {
}
});
- if (!isRestored && item && 'PhotoAlbum' !== item.Type) {
+ if (!isRestored && item && item.Type !== 'PhotoAlbum') {
initAlphaPicker();
}
const 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);
@@ -858,14 +861,14 @@ class ItemsView {
getFilters() {
const 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'),
@@ -880,7 +883,7 @@ class ItemsView {
const 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'
};
}
getDefaultSortBy() {
@@ -897,7 +900,7 @@ class ItemsView {
const sortBy = [];
const params = this.params;
- if ('Programs' === params.type) {
+ if (params.type === 'Programs') {
sortBy.push({
name: globalize.translate('AirDate'),
value: 'StartDate,SortName'
@@ -922,7 +925,7 @@ class ItemsView {
sortBy.push(option);
}
- if ('Programs' !== params.type) {
+ if (params.type !== 'Programs') {
sortBy.push({
name: globalize.translate('DateAdded'),
value: 'DateCreated,SortName'
@@ -964,7 +967,7 @@ class ItemsView {
return sortBy;
}
getNameSortOption(params) {
- if ('Episode' === params.type) {
+ if (params.type === 'Episode') {
return {
name: globalize.translate('Name'),
value: 'SeriesName,SortName'
@@ -977,7 +980,7 @@ class ItemsView {
};
}
getPlayCountSortOption() {
- if ('Programs' === this.params.type) {
+ if (this.params.type === 'Programs') {
return null;
}
@@ -985,9 +988,10 @@ class ItemsView {
name: globalize.translate('PlayCount'),
value: 'PlayCount,SortName'
};
+
}
getDatePlayedSortOption() {
- if ('Programs' === this.params.type) {
+ if (this.params.type === 'Programs') {
return null;
}
@@ -997,7 +1001,11 @@ class ItemsView {
};
}
getCriticRatingSortOption() {
- if ('Programs' === this.params.type) {
+ if (this.params.type === 'Programs') {
+ };
+
+ ItemsView.prototype.getCriticRatingSortOption = function () {
+ if () {
return null;
}
@@ -1016,8 +1024,8 @@ class ItemsView {
const filters = [];
const 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');
@@ -1082,7 +1090,7 @@ class ItemsView {
const item = (this.params, this.currentItem);
const fields = ['showTitle'];
- if (!item || 'PhotoAlbum' !== item.Type && 'ChannelFolderItem' !== item.Type) {
+ if (!item || item.Type !== 'PhotoAlbum' && item.Type !== 'ChannelFolderItem') {
fields.push('imageType');
}
@@ -1095,25 +1103,25 @@ class ItemsView {
const item = this.currentItem;
let 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;
}
let 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'
};
@@ -1121,11 +1129,11 @@ class ItemsView {
getItemTypes() {
const 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/livetvchannels.js b/src/controllers/livetv/livetvchannels.js
index 62906d9d21..f5a0abeb38 100644
--- a/src/controllers/livetv/livetvchannels.js
+++ b/src/controllers/livetv/livetvchannels.js
@@ -1,6 +1,9 @@
define(['cardBuilder', 'imageLoader', 'libraryBrowser', 'loading', 'events', 'userSettings', 'emby-itemscontainer'], function (cardBuilder, imageLoader, libraryBrowser, loading, events, userSettings) {
'use strict';
+ loading = loading.default || loading;
+ libraryBrowser = libraryBrowser.default || libraryBrowser;
+
return function (view, params, tabContent) {
function getPageData() {
if (!pageData) {
diff --git a/src/controllers/livetv/livetvrecordings.js b/src/controllers/livetv/livetvrecordings.js
index d832ca1339..b0259bc89b 100644
--- a/src/controllers/livetv/livetvrecordings.js
+++ b/src/controllers/livetv/livetvrecordings.js
@@ -1,6 +1,8 @@
define(['layoutManager', 'loading', 'cardBuilder', 'apphost', 'imageLoader', 'scripts/livetvcomponents', 'listViewStyle', 'emby-itemscontainer'], function (layoutManager, loading, cardBuilder, appHost, imageLoader) {
'use strict';
+ loading = loading.default || loading;
+
function renderRecordings(elem, recordings, cardOptions, scrollX) {
if (!elem) {
return;
diff --git a/src/controllers/livetv/livetvschedule.js b/src/controllers/livetv/livetvschedule.js
index 2f451e50fb..4427bef5d1 100644
--- a/src/controllers/livetv/livetvschedule.js
+++ b/src/controllers/livetv/livetvschedule.js
@@ -1,6 +1,8 @@
define(['layoutManager', 'cardBuilder', 'apphost', 'imageLoader', 'loading', 'scripts/livetvcomponents', 'emby-button', 'emby-itemscontainer'], function (layoutManager, cardBuilder, appHost, imageLoader, loading) {
'use strict';
+ loading = loading.default || loading;
+
function enableScrollX() {
return !layoutManager.desktop;
}
diff --git a/src/controllers/livetv/livetvseriestimers.js b/src/controllers/livetv/livetvseriestimers.js
index c5d0da60d7..62f36a1006 100644
--- a/src/controllers/livetv/livetvseriestimers.js
+++ b/src/controllers/livetv/livetvseriestimers.js
@@ -1,6 +1,8 @@
define(['datetime', 'cardBuilder', 'imageLoader', 'apphost', 'loading', 'paper-icon-button-light', 'emby-button'], function (datetime, cardBuilder, imageLoader, appHost, loading) {
'use strict';
+ loading = loading.default || loading;
+
function renderTimers(context, timers) {
var html = '';
html += cardBuilder.getCardsHtml({
diff --git a/src/controllers/livetv/livetvsuggested.js b/src/controllers/livetv/livetvsuggested.js
index 036eee9fc6..79d9aac6e9 100644
--- a/src/controllers/livetv/livetvsuggested.js
+++ b/src/controllers/livetv/livetvsuggested.js
@@ -1,6 +1,8 @@
define(['layoutManager', 'userSettings', 'inputManager', 'loading', 'globalize', 'libraryBrowser', 'mainTabsManager', 'cardBuilder', 'apphost', 'imageLoader', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (layoutManager, userSettings, inputManager, loading, globalize, libraryBrowser, mainTabsManager, cardBuilder, appHost, imageLoader) {
'use strict';
+ loading = loading.default || loading;
+
function enableScrollX() {
return !layoutManager.desktop;
}
@@ -142,9 +144,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 +263,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 +273,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 +307,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/livetvguideprovider.js b/src/controllers/livetvguideprovider.js
index 8f8b9f91c7..3ec04fd2af 100644
--- a/src/controllers/livetvguideprovider.js
+++ b/src/controllers/livetvguideprovider.js
@@ -1,6 +1,8 @@
define(['events', 'loading', 'globalize'], function (events, loading, globalize) {
'use strict';
+ loading = loading.default || loading;
+
function onListingsSubmitted() {
Dashboard.navigate('livetvstatus.html');
}
diff --git a/src/controllers/livetvsettings.js b/src/controllers/livetvsettings.js
index 715eb06214..29ec4a10a5 100644
--- a/src/controllers/livetvsettings.js
+++ b/src/controllers/livetvsettings.js
@@ -1,65 +1,68 @@
-define(['jQuery', 'loading', 'globalize', 'emby-button'], function ($, loading, globalize) {
- 'use strict';
+import $ from 'jQuery';
+import loading from 'loading';
+import globalize from 'globalize';
+import 'emby-button';
- function loadPage(page, config) {
- $('.liveTvSettingsForm', page).show();
- $('.noLiveTvServices', page).hide();
- $('#selectGuideDays', page).val(config.GuideDays || '');
- $('#txtPrePaddingMinutes', page).val(config.PrePaddingSeconds / 60);
- $('#txtPostPaddingMinutes', page).val(config.PostPaddingSeconds / 60);
- page.querySelector('#txtRecordingPath').value = config.RecordingPath || '';
- page.querySelector('#txtMovieRecordingPath').value = config.MovieRecordingPath || '';
- page.querySelector('#txtSeriesRecordingPath').value = config.SeriesRecordingPath || '';
- page.querySelector('#txtPostProcessor').value = config.RecordingPostProcessor || '';
- page.querySelector('#txtPostProcessorArguments').value = config.RecordingPostProcessorArguments || '';
- loading.hide();
- }
+function loadPage(page, config) {
+ $('.liveTvSettingsForm', page).show();
+ $('.noLiveTvServices', page).hide();
+ $('#selectGuideDays', page).val(config.GuideDays || '');
+ $('#txtPrePaddingMinutes', page).val(config.PrePaddingSeconds / 60);
+ $('#txtPostPaddingMinutes', page).val(config.PostPaddingSeconds / 60);
+ page.querySelector('#txtRecordingPath').value = config.RecordingPath || '';
+ page.querySelector('#txtMovieRecordingPath').value = config.MovieRecordingPath || '';
+ page.querySelector('#txtSeriesRecordingPath').value = config.SeriesRecordingPath || '';
+ page.querySelector('#txtPostProcessor').value = config.RecordingPostProcessor || '';
+ page.querySelector('#txtPostProcessorArguments').value = config.RecordingPostProcessorArguments || '';
+ loading.hide();
+}
- function onSubmit() {
- loading.show();
- var form = this;
- ApiClient.getNamedConfiguration('livetv').then(function (config) {
- config.GuideDays = $('#selectGuideDays', form).val() || null;
- var recordingPath = form.querySelector('#txtRecordingPath').value || null;
- var movieRecordingPath = form.querySelector('#txtMovieRecordingPath').value || null;
- var seriesRecordingPath = form.querySelector('#txtSeriesRecordingPath').value || null;
- var recordingPathChanged = recordingPath != config.RecordingPath || movieRecordingPath != config.MovieRecordingPath || seriesRecordingPath != config.SeriesRecordingPath;
- config.RecordingPath = recordingPath;
- config.MovieRecordingPath = movieRecordingPath;
- config.SeriesRecordingPath = seriesRecordingPath;
- config.RecordingEncodingFormat = 'mkv';
- config.PrePaddingSeconds = 60 * $('#txtPrePaddingMinutes', form).val();
- config.PostPaddingSeconds = 60 * $('#txtPostPaddingMinutes', form).val();
- config.RecordingPostProcessor = $('#txtPostProcessor', form).val();
- config.RecordingPostProcessorArguments = $('#txtPostProcessorArguments', form).val();
- ApiClient.updateNamedConfiguration('livetv', config).then(function () {
- Dashboard.processServerConfigurationUpdateResult();
- showSaveMessage(recordingPathChanged);
- });
+function onSubmit() {
+ loading.show();
+ const form = this;
+ ApiClient.getNamedConfiguration('livetv').then(function (config) {
+ config.GuideDays = $('#selectGuideDays', form).val() || null;
+ const recordingPath = form.querySelector('#txtRecordingPath').value || null;
+ const movieRecordingPath = form.querySelector('#txtMovieRecordingPath').value || null;
+ const seriesRecordingPath = form.querySelector('#txtSeriesRecordingPath').value || null;
+ const recordingPathChanged = recordingPath != config.RecordingPath || movieRecordingPath != config.MovieRecordingPath || seriesRecordingPath != config.SeriesRecordingPath;
+ config.RecordingPath = recordingPath;
+ config.MovieRecordingPath = movieRecordingPath;
+ config.SeriesRecordingPath = seriesRecordingPath;
+ config.RecordingEncodingFormat = 'mkv';
+ config.PrePaddingSeconds = 60 * $('#txtPrePaddingMinutes', form).val();
+ config.PostPaddingSeconds = 60 * $('#txtPostPaddingMinutes', form).val();
+ config.RecordingPostProcessor = $('#txtPostProcessor', form).val();
+ config.RecordingPostProcessorArguments = $('#txtPostProcessorArguments', form).val();
+ ApiClient.updateNamedConfiguration('livetv', config).then(function () {
+ Dashboard.processServerConfigurationUpdateResult();
+ showSaveMessage(recordingPathChanged);
});
- return false;
+ });
+ return false;
+}
+
+function showSaveMessage(recordingPathChanged) {
+ let msg = '';
+
+ if (recordingPathChanged) {
+ msg += globalize.translate('MessageChangeRecordingPath');
}
- function showSaveMessage(recordingPathChanged) {
- var msg = '';
-
- if (recordingPathChanged) {
- msg += globalize.translate('RecordingPathChangeMessage');
- }
-
- if (msg) {
- require(['alert'], function (alert) {
- alert(msg);
- });
- }
+ if (msg) {
+ import('alert').then(({default: alert}) => {
+ alert(msg);
+ });
}
+}
+export default function () {
$(document).on('pageinit', '#liveTvSettingsPage', function () {
- var page = this;
+ const page = this;
$('.liveTvSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
$('#btnSelectRecordingPath', page).on('click.selectDirectory', function () {
- require(['directorybrowser'], function (directoryBrowser) {
- var picker = new directoryBrowser.default();
+ import('directorybrowser').then(({default: directoryBrowser}) => {
+ const picker = new directoryBrowser();
picker.show({
callback: function (path) {
if (path) {
@@ -73,8 +76,8 @@ define(['jQuery', 'loading', 'globalize', 'emby-button'], function ($, loading,
});
});
$('#btnSelectMovieRecordingPath', page).on('click.selectDirectory', function () {
- require(['directorybrowser'], function (directoryBrowser) {
- var picker = new directoryBrowser.default();
+ import('directorybrowser').then(({default: directoryBrowser}) => {
+ const picker = new directoryBrowser();
picker.show({
callback: function (path) {
if (path) {
@@ -88,8 +91,8 @@ define(['jQuery', 'loading', 'globalize', 'emby-button'], function ($, loading,
});
});
$('#btnSelectSeriesRecordingPath', page).on('click.selectDirectory', function () {
- require(['directorybrowser'], function (directoryBrowser) {
- var picker = new directoryBrowser.default();
+ import('directorybrowser').then(({default: directoryBrowser}) => {
+ const picker = new directoryBrowser();
picker.show({
callback: function (path) {
if (path) {
@@ -103,8 +106,8 @@ define(['jQuery', 'loading', 'globalize', 'emby-button'], function ($, loading,
});
});
$('#btnSelectPostProcessorPath', page).on('click.selectDirectory', function () {
- require(['directorybrowser'], function (directoryBrowser) {
- var picker = new directoryBrowser.default();
+ import('directorybrowser').then(({default: directoryBrowser}) => {
+ const picker = new directoryBrowser();
picker.show({
includeFiles: true,
callback: function (path) {
@@ -119,9 +122,9 @@ define(['jQuery', 'loading', 'globalize', 'emby-button'], function ($, loading,
});
}).on('pageshow', '#liveTvSettingsPage', function () {
loading.show();
- var page = this;
+ const page = this;
ApiClient.getNamedConfiguration('livetv').then(function (config) {
loadPage(page, config);
});
});
-});
+}
diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js
index 84ea006fd9..f37760808a 100644
--- a/src/controllers/livetvstatus.js
+++ b/src/controllers/livetvstatus.js
@@ -1,294 +1,305 @@
-define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layoutManager', 'loading', 'browser', 'listViewStyle', 'flexStyles', 'emby-itemscontainer', 'cardStyle', 'material-icons', 'emby-button'], function ($, globalize, taskButton, dom, libraryMenu, layoutManager, loading, browser) {
- 'use strict';
+import $ from 'jQuery';
+import globalize from 'globalize';
+import taskButton from 'scripts/taskbutton';
+import dom from 'dom';
+import layoutManager from 'layoutManager';
+import loading from 'loading';
+import browser from 'browser';
+import 'listViewStyle';
+import 'flexStyles';
+import 'emby-itemscontainer';
+import 'cardStyle';
+import 'material-icons';
+import 'emby-button';
- var enableFocusTransform = !browser.slow && !browser.edge;
+const enableFocusTransform = !browser.slow && !browser.edge;
- function getDeviceHtml(device) {
- var padderClass;
- var html = '';
- var cssClass = 'card scalableCard';
- var cardBoxCssClass = 'cardBox visualCardBox';
- cssClass += ' backdropCard backdropCard-scalable';
- padderClass = 'cardPadder-backdrop';
+function getDeviceHtml(device) {
+ let padderClass;
+ let html = '';
+ let cssClass = 'card scalableCard';
+ let cardBoxCssClass = 'cardBox visualCardBox';
+ cssClass += ' backdropCard backdropCard-scalable';
+ padderClass = 'cardPadder-backdrop';
- // TODO move card creation code to Card component
+ // TODO move card creation code to Card component
- if (layoutManager.tv) {
- cssClass += ' show-focus';
+ if (layoutManager.tv) {
+ cssClass += ' show-focus';
- if (enableFocusTransform) {
- cssClass += ' show-animation';
- }
+ if (enableFocusTransform) {
+ cssClass += ' show-animation';
}
-
- html += '
';
- html += '
';
- html += '
';
- html += '
';
- html += '
';
- html += '
';
- html += '
';
- html += '
';
- html += '';
- html += '
';
- return html += '
';
}
- function renderDevices(page, devices) {
- var html = devices.map(getDeviceHtml).join('');
- page.querySelector('.devicesList').innerHTML = html;
- }
+ html += '
';
+ html += '
';
+ html += '
';
+ html += '
';
+ html += '
';
+ html += '
';
+ html += '
';
+ html += '
';
+ html += '';
+ html += '
';
+ return html += '
';
+}
- function deleteDevice(page, id) {
- var message = globalize.translate('MessageConfirmDeleteTunerDevice');
+function renderDevices(page, devices) {
+ page.querySelector('.devicesList').innerHTML = devices.map(getDeviceHtml).join('');
+}
- require(['confirm'], function (confirm) {
- confirm.default(message, globalize.translate('HeaderDeleteDevice')).then(function () {
- loading.show();
- ApiClient.ajax({
- type: 'DELETE',
- url: ApiClient.getUrl('LiveTv/TunerHosts', {
- Id: id
- })
- }).then(function () {
- reload(page);
- });
+function deleteDevice(page, id) {
+ const message = globalize.translate('MessageConfirmDeleteTunerDevice');
+
+ import('confirm').then(({default: confirm}) => {
+ confirm(message, globalize.translate('HeaderDeleteDevice')).then(function () {
+ loading.show();
+ ApiClient.ajax({
+ type: 'DELETE',
+ url: ApiClient.getUrl('LiveTv/TunerHosts', {
+ Id: id
+ })
+ }).then(function () {
+ reload(page);
});
});
- }
+ });
+}
- function reload(page) {
- loading.show();
- ApiClient.getNamedConfiguration('livetv').then(function (config) {
- renderDevices(page, config.TunerHosts);
- renderProviders(page, config.ListingProviders);
+function reload(page) {
+ loading.show();
+ ApiClient.getNamedConfiguration('livetv').then(function (config) {
+ renderDevices(page, config.TunerHosts);
+ renderProviders(page, config.ListingProviders);
+ });
+ loading.hide();
+}
+
+function submitAddDeviceForm(page) {
+ page.querySelector('.dlgAddDevice').close();
+ loading.show();
+ ApiClient.ajax({
+ type: 'POST',
+ url: ApiClient.getUrl('LiveTv/TunerHosts'),
+ data: JSON.stringify({
+ Type: $('#selectTunerDeviceType', page).val(),
+ Url: $('#txtDevicePath', page).val()
+ }),
+ contentType: 'application/json'
+ }).then(function () {
+ reload(page);
+ }, function () {
+ Dashboard.alert({
+ message: globalize.translate('ErrorAddingTunerDevice')
});
- loading.hide();
- }
+ });
+}
- function submitAddDeviceForm(page) {
- page.querySelector('.dlgAddDevice').close();
- loading.show();
- ApiClient.ajax({
- type: 'POST',
- url: ApiClient.getUrl('LiveTv/TunerHosts'),
- data: JSON.stringify({
- Type: $('#selectTunerDeviceType', page).val(),
- Url: $('#txtDevicePath', page).val()
- }),
- contentType: 'application/json'
- }).then(function () {
- reload(page);
- }, function () {
- Dashboard.alert({
- message: globalize.translate('ErrorAddingTunerDevice')
- });
- });
- }
+function renderProviders(page, providers) {
+ let html = '';
- function renderProviders(page, providers) {
- var html = '';
-
- if (providers.length) {
- html += '
';
-
- for (var i = 0, length = providers.length; i < length; i++) {
- var provider = providers[i];
- html += '
';
- html += '
';
- html += '
';
- html += '
';
- html += '
';
- }
+ if (providers.length) {
+ html += '
';
+ for (let i = 0, length = providers.length; i < length; i++) {
+ const provider = providers[i];
+ html += '
';
+ html += '
';
+ html += '
';
+ html += '
';
html += '
';
}
- var elem = $('.providerList', page).html(html);
- $('.btnOptions', elem).on('click', function () {
- var id = this.getAttribute('data-id');
- showProviderOptions(page, id, this);
- });
+ html += '
';
}
- function showProviderOptions(page, providerId, button) {
- var items = [];
- items.push({
- name: globalize.translate('ButtonDelete'),
- id: 'delete'
- });
- items.push({
- name: globalize.translate('MapChannels'),
- id: 'map'
- });
+ const elem = $('.providerList', page).html(html);
+ $('.btnOptions', elem).on('click', function () {
+ const id = this.getAttribute('data-id');
+ showProviderOptions(page, id, this);
+ });
+}
- require(['actionsheet'], function (actionsheet) {
- actionsheet.show({
- items: items,
- positionTo: button
- }).then(function (id) {
- switch (id) {
- case 'delete':
- deleteProvider(page, providerId);
- break;
+function showProviderOptions(page, providerId, button) {
+ const items = [];
+ items.push({
+ name: globalize.translate('ButtonDelete'),
+ id: 'delete'
+ });
+ items.push({
+ name: globalize.translate('MapChannels'),
+ id: 'map'
+ });
- case 'map':
- mapChannels(page, providerId);
- }
- });
- });
- }
+ import('actionsheet').then(({default: actionsheet}) => {
+ actionsheet.show({
+ items: items,
+ positionTo: button
+ }).then(function (id) {
+ switch (id) {
+ case 'delete':
+ deleteProvider(page, providerId);
+ break;
- function mapChannels(page, providerId) {
- require(['components/channelMapper/channelMapper'], function (channelMapper) {
- new channelMapper.default({
- serverId: ApiClient.serverInfo().Id,
- providerId: providerId
- }).show();
- });
- }
-
- function deleteProvider(page, id) {
- var message = globalize.translate('MessageConfirmDeleteGuideProvider');
-
- require(['confirm'], function (confirm) {
- confirm.default(message, globalize.translate('HeaderDeleteProvider')).then(function () {
- loading.show();
- ApiClient.ajax({
- type: 'DELETE',
- url: ApiClient.getUrl('LiveTv/ListingProviders', {
- Id: id
- })
- }).then(function () {
- reload(page);
- }, function () {
- reload(page);
- });
- });
- });
- }
-
- function getTunerName(providerId) {
- switch (providerId = providerId.toLowerCase()) {
- case 'm3u':
- return 'M3U';
- case 'hdhomerun':
- return 'HDHomeRun';
- case 'hauppauge':
- return 'Hauppauge';
- case 'satip':
- return 'DVB';
- default:
- return 'Unknown';
- }
- }
-
- function getProviderName(providerId) {
- switch (providerId = providerId.toLowerCase()) {
- case 'schedulesdirect':
- return 'Schedules Direct';
- case 'xmltv':
- return 'XMLTV';
- default:
- return 'Unknown';
- }
- }
-
- function getProviderConfigurationUrl(providerId) {
- switch (providerId = providerId.toLowerCase()) {
- case 'xmltv':
- return 'livetvguideprovider.html?type=xmltv';
- case 'schedulesdirect':
- return 'livetvguideprovider.html?type=schedulesdirect';
- }
- }
-
- function addProvider(button) {
- var menuItems = [];
- menuItems.push({
- name: 'Schedules Direct',
- id: 'SchedulesDirect'
- });
- menuItems.push({
- name: 'XMLTV',
- id: 'xmltv'
- });
-
- require(['actionsheet'], function (actionsheet) {
- actionsheet.show({
- items: menuItems,
- positionTo: button,
- callback: function (id) {
- Dashboard.navigate(getProviderConfigurationUrl(id));
- }
- });
- });
- }
-
- function addDevice(button) {
- Dashboard.navigate('livetvtuner.html');
- }
-
- function showDeviceMenu(button, tunerDeviceId) {
- var items = [];
- items.push({
- name: globalize.translate('ButtonDelete'),
- id: 'delete'
- });
- items.push({
- name: globalize.translate('ButtonEdit'),
- id: 'edit'
- });
-
- require(['actionsheet'], function (actionsheet) {
- actionsheet.show({
- items: items,
- positionTo: button
- }).then(function (id) {
- switch (id) {
- case 'delete':
- deleteDevice(dom.parentWithClass(button, 'page'), tunerDeviceId);
- break;
-
- case 'edit':
- Dashboard.navigate('livetvtuner.html?id=' + tunerDeviceId);
- }
- });
- });
- }
-
- function onDevicesListClick(e) {
- var card = dom.parentWithClass(e.target, 'card');
-
- if (card) {
- var id = card.getAttribute('data-id');
- var btnCardOptions = dom.parentWithClass(e.target, 'btnCardOptions');
-
- if (btnCardOptions) {
- showDeviceMenu(btnCardOptions, id);
- } else {
- Dashboard.navigate('livetvtuner.html?id=' + id);
+ case 'map':
+ mapChannels(page, providerId);
}
+ });
+ });
+}
+
+function mapChannels(page, providerId) {
+ import('components/channelMapper/channelMapper').then(({default: channelMapper}) => {
+ new channelMapper({
+ serverId: ApiClient.serverInfo().Id,
+ providerId: providerId
+ }).show();
+ });
+}
+
+function deleteProvider(page, id) {
+ const message = globalize.translate('MessageConfirmDeleteGuideProvider');
+
+ import('confirm').then(({default: confirm}) => {
+ confirm(message, globalize.translate('HeaderDeleteProvider')).then(function () {
+ loading.show();
+ ApiClient.ajax({
+ type: 'DELETE',
+ url: ApiClient.getUrl('LiveTv/ListingProviders', {
+ Id: id
+ })
+ }).then(function () {
+ reload(page);
+ }, function () {
+ reload(page);
+ });
+ });
+ });
+}
+
+function getTunerName(providerId) {
+ switch (providerId = providerId.toLowerCase()) {
+ case 'm3u':
+ return 'M3U';
+ case 'hdhomerun':
+ return 'HDHomeRun';
+ case 'hauppauge':
+ return 'Hauppauge';
+ case 'satip':
+ return 'DVB';
+ default:
+ return 'Unknown';
+ }
+}
+
+function getProviderName(providerId) {
+ switch (providerId = providerId.toLowerCase()) {
+ case 'schedulesdirect':
+ return 'Schedules Direct';
+ case 'xmltv':
+ return 'XMLTV';
+ default:
+ return 'Unknown';
+ }
+}
+
+function getProviderConfigurationUrl(providerId) {
+ switch (providerId = providerId.toLowerCase()) {
+ case 'xmltv':
+ return 'livetvguideprovider.html?type=xmltv';
+ case 'schedulesdirect':
+ return 'livetvguideprovider.html?type=schedulesdirect';
+ }
+}
+
+function addProvider(button) {
+ const menuItems = [];
+ menuItems.push({
+ name: 'Schedules Direct',
+ id: 'SchedulesDirect'
+ });
+ menuItems.push({
+ name: 'XMLTV',
+ id: 'xmltv'
+ });
+
+ import('actionsheet').then(({default: actionsheet}) => {
+ actionsheet.show({
+ items: menuItems,
+ positionTo: button,
+ callback: function (id) {
+ Dashboard.navigate(getProviderConfigurationUrl(id));
+ }
+ });
+ });
+}
+
+function addDevice(button) {
+ Dashboard.navigate('livetvtuner.html');
+}
+
+function showDeviceMenu(button, tunerDeviceId) {
+ const items = [];
+ items.push({
+ name: globalize.translate('ButtonDelete'),
+ id: 'delete'
+ });
+ items.push({
+ name: globalize.translate('ButtonEdit'),
+ id: 'edit'
+ });
+
+ import('actionsheet').then(({default: actionsheet}) => {
+ actionsheet.show({
+ items: items,
+ positionTo: button
+ }).then(function (id) {
+ switch (id) {
+ case 'delete':
+ deleteDevice(dom.parentWithClass(button, 'page'), tunerDeviceId);
+ break;
+
+ case 'edit':
+ Dashboard.navigate('livetvtuner.html?id=' + tunerDeviceId);
+ }
+ });
+ });
+}
+
+function onDevicesListClick(e) {
+ const card = dom.parentWithClass(e.target, 'card');
+
+ if (card) {
+ const id = card.getAttribute('data-id');
+ const btnCardOptions = dom.parentWithClass(e.target, 'btnCardOptions');
+
+ if (btnCardOptions) {
+ showDeviceMenu(btnCardOptions, id);
+ } else {
+ Dashboard.navigate('livetvtuner.html?id=' + id);
}
}
+}
+export default function () {
$(document).on('pageinit', '#liveTvStatusPage', function () {
- var page = this;
+ const page = this;
$('.btnAddDevice', page).on('click', function () {
addDevice(this);
});
@@ -301,21 +312,21 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo
});
page.querySelector('.devicesList').addEventListener('click', onDevicesListClick);
}).on('pageshow', '#liveTvStatusPage', function () {
- var page = this;
+ const page = this;
reload(page);
- taskButton.default({
+ taskButton({
mode: 'on',
progressElem: page.querySelector('.refreshGuideProgress'),
taskKey: 'RefreshGuide',
button: page.querySelector('.btnRefresh')
});
}).on('pagehide', '#liveTvStatusPage', function () {
- var page = this;
- taskButton.default({
+ const page = this;
+ taskButton({
mode: 'off',
progressElem: page.querySelector('.refreshGuideProgress'),
taskKey: 'RefreshGuide',
button: page.querySelector('.btnRefresh')
});
});
-});
+}
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 65abca46e0..7c1a5156d9 100644
--- a/src/controllers/movies/moviecollections.js
+++ b/src/controllers/movies/moviecollections.js
@@ -1,6 +1,9 @@
define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardBuilder', 'userSettings', 'globalize', 'emby-itemscontainer'], function (loading, events, libraryBrowser, imageLoader, listView, cardBuilder, userSettings, globalize) {
'use strict';
+ loading = loading.default || loading;
+ libraryBrowser = libraryBrowser.default || libraryBrowser;
+
return function (view, params, tabContent) {
function getPageData(context) {
var key = getSavedQueryKey(context);
@@ -48,7 +51,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 43f73bfa76..82ab4d4d4b 100644
--- a/src/controllers/movies/moviegenres.js
+++ b/src/controllers/movies/moviegenres.js
@@ -1,6 +1,9 @@
define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader', 'apphost', 'globalize', 'appRouter', 'dom', 'emby-button'], function (layoutManager, loading, libraryBrowser, cardBuilder, lazyLoader, appHost, globalize, appRouter, dom) {
'use strict';
+ loading = loading.default || loading;
+ libraryBrowser = libraryBrowser.default || libraryBrowser;
+
return function (view, params, tabContent) {
function getPageData() {
var key = getSavedQueryKey();
@@ -54,13 +57,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/movies/movies.js b/src/controllers/movies/movies.js
index 82b162e2ad..ade9dc4b89 100644
--- a/src/controllers/movies/movies.js
+++ b/src/controllers/movies/movies.js
@@ -1,6 +1,9 @@
define(['loading', 'layoutManager', 'userSettings', 'events', 'libraryBrowser', 'alphaPicker', 'listView', 'cardBuilder', 'globalize', 'emby-itemscontainer'], function (loading, layoutManager, userSettings, events, libraryBrowser, AlphaPicker, listView, cardBuilder, globalize) {
'use strict';
+ loading = loading.default || loading;
+ libraryBrowser = libraryBrowser.default || libraryBrowser;
+
return function (view, params, tabContent, options) {
function onViewStyleChange() {
if (self.getCurrentViewStyle() == 'List') {
diff --git a/src/controllers/movies/moviesrecommended.js b/src/controllers/movies/moviesrecommended.js
index 4ffe7888cf..a633d654cd 100644
--- a/src/controllers/movies/moviesrecommended.js
+++ b/src/controllers/movies/moviesrecommended.js
@@ -1,6 +1,8 @@
define(['events', 'layoutManager', 'inputManager', 'userSettings', 'libraryMenu', 'mainTabsManager', 'cardBuilder', 'dom', 'imageLoader', 'playbackManager', 'globalize', 'emby-scroller', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (events, layoutManager, inputManager, userSettings, libraryMenu, mainTabsManager, cardBuilder, dom, imageLoader, playbackManager, globalize) {
'use strict';
+ playbackManager = playbackManager.default || playbackManager;
+
function enableScrollX() {
return !layoutManager.desktop;
}
diff --git a/src/controllers/movies/movietrailers.js b/src/controllers/movies/movietrailers.js
index a9db0abf49..8d9fe8d090 100644
--- a/src/controllers/movies/movietrailers.js
+++ b/src/controllers/movies/movietrailers.js
@@ -1,6 +1,9 @@
define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'userSettings', 'globalize', 'emby-itemscontainer'], function (layoutManager, loading, events, libraryBrowser, imageLoader, AlphaPicker, listView, cardBuilder, userSettings, globalize) {
'use strict';
+ loading = loading.default || loading;
+ libraryBrowser = libraryBrowser.default || libraryBrowser;
+
return function (view, params, tabContent) {
function getPageData(context) {
var key = getSavedQueryKey(context);
diff --git a/src/controllers/music/musicalbums.js b/src/controllers/music/musicalbums.js
index 3630e0b9f9..7d03c91073 100644
--- a/src/controllers/music/musicalbums.js
+++ b/src/controllers/music/musicalbums.js
@@ -1,7 +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';
- return function (view, params, tabContent) {
+/* eslint-disable indent */
+
+ export default function (view, params, tabContent) {
function playAll() {
ApiClient.getItem(ApiClient.getCurrentUserId(), params.topParentId).then(function (item) {
playbackManager.play({
@@ -18,7 +29,7 @@ define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser
}
function getPageData() {
- var key = getSavedQueryKey();
+ const key = getSavedQueryKey();
if (!pageData) {
pageData = {
@@ -59,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 {
@@ -76,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) {
@@ -102,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,
@@ -113,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,
@@ -144,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()
@@ -205,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'
});
@@ -259,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;
@@ -284,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 c9a0b06b77..23e0bbd459 100644
--- a/src/controllers/music/musicartists.js
+++ b/src/controllers/music/musicartists.js
@@ -1,13 +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';
- return function (view, params, tabContent) {
+/* eslint-disable indent */
+
+ 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,
@@ -45,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 {
@@ -62,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) {
@@ -91,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,
@@ -102,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,
@@ -129,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()
@@ -189,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'
});
@@ -211,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;
@@ -234,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 82f2eba574..29e0d888e4 100644
--- a/src/controllers/music/musicgenres.js
+++ b/src/controllers/music/musicgenres.js
@@ -1,10 +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';
- return function (view, params, tabContent) {
+/* eslint-disable indent */
+
+ 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] = {
@@ -34,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({
@@ -82,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);
});
});
@@ -99,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(',');
@@ -117,7 +121,7 @@ define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'loading'], f
};
self.enableViewSelection = true;
- var promise;
+ let promise;
self.preRender = function () {
promise = getPromise();
@@ -126,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 f508489216..befeafcf4c 100644
--- a/src/controllers/music/musicplaylists.js
+++ b/src/controllers/music/musicplaylists.js
@@ -1,10 +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';
- return function (view, params, tabContent) {
+/* eslint-disable indent */
+
+ 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] = {
@@ -35,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',
@@ -53,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();
@@ -81,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 aa63ec51fe..4c4f229e58 100644
--- a/src/controllers/music/songs.js
+++ b/src/controllers/music/songs.js
@@ -1,10 +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';
- return function (view, params, tabContent) {
+/* eslint-disable indent */
+
+ 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] = {
@@ -46,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) {
@@ -71,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,
@@ -83,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()
@@ -193,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 @@
-
-
diff --git a/yarn.lock b/yarn.lock
index 6704749acb..94d714872d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,28 +9,28 @@
dependencies:
"@babel/highlight" "^7.10.4"
-"@babel/compat-data@^7.10.4":
- version "7.10.4"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.4.tgz#706a6484ee6f910b719b696a9194f8da7d7ac241"
- integrity sha512-t+rjExOrSVvjQQXNp5zAIYDp00KjdvGl/TpDX5REPr0S9IAIPQMTilcfG6q8c0QFmj9lSTVySV2VTsyggvtNIw==
+"@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz#e9f73efe09af1355b723a7f39b11bad637d7c99c"
+ integrity sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==
dependencies:
browserslist "^4.12.0"
invariant "^2.2.4"
semver "^5.5.0"
-"@babel/core@>=7.2.2", "@babel/core@>=7.9.0", "@babel/core@^7.10.5":
- version "7.10.5"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.5.tgz#1f15e2cca8ad9a1d78a38ddba612f5e7cdbbd330"
- integrity sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w==
+"@babel/core@>=7.2.2", "@babel/core@>=7.9.0", "@babel/core@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.0.tgz#73b9c33f1658506887f767c26dae07798b30df76"
+ integrity sha512-mkLq8nwaXmDtFmRkQ8ED/eA2CnVw4zr7dCztKalZXBvdK5EeNUAesrrwUqjQEzFgomJssayzB0aqlOsP1vGLqg==
dependencies:
"@babel/code-frame" "^7.10.4"
- "@babel/generator" "^7.10.5"
- "@babel/helper-module-transforms" "^7.10.5"
+ "@babel/generator" "^7.11.0"
+ "@babel/helper-module-transforms" "^7.11.0"
"@babel/helpers" "^7.10.4"
- "@babel/parser" "^7.10.5"
+ "@babel/parser" "^7.11.0"
"@babel/template" "^7.10.4"
- "@babel/traverse" "^7.10.5"
- "@babel/types" "^7.10.5"
+ "@babel/traverse" "^7.11.0"
+ "@babel/types" "^7.11.0"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.1"
@@ -40,12 +40,28 @@
semver "^5.4.1"
source-map "^0.5.0"
-"@babel/generator@^7.10.5":
- version "7.10.5"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.5.tgz#1b903554bc8c583ee8d25f1e8969732e6b829a69"
- integrity sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig==
+"@babel/eslint-parser@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.11.0.tgz#b123924edd44508782c030066c926f1b807151cd"
+ integrity sha512-dJDM2Pc01D9TwKL3Mmz2xgVF9X953RBHq9H4gywbN1q8MrfvXmNHfsCt06vvByBVQqm+9WxMs+doEH/R09TwWQ==
dependencies:
- "@babel/types" "^7.10.5"
+ eslint-scope "5.1.0"
+ eslint-visitor-keys "^1.3.0"
+ semver "^6.3.0"
+
+"@babel/eslint-plugin@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.11.0.tgz#55d5b6bd29859cabce152f16d01b3a8150d5b295"
+ integrity sha512-+gfPM0/T6d25jKBgmxWp38W0jqRs16Vt7DPBxGOcnN/7nS2A/6QoaXOYEaccvWS5a9UpWlMIAylivp6UtH8/sQ==
+ dependencies:
+ eslint-rule-composer "^0.3.0"
+
+"@babel/generator@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.0.tgz#4b90c78d8c12825024568cbe83ee6c9af193585c"
+ integrity sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==
+ dependencies:
+ "@babel/types" "^7.11.0"
jsesc "^2.5.1"
source-map "^0.5.0"
@@ -150,17 +166,17 @@
dependencies:
"@babel/types" "^7.10.4"
-"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5":
- version "7.10.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz#120c271c0b3353673fcdfd8c053db3c544a260d6"
- integrity sha512-4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA==
+"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359"
+ integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==
dependencies:
"@babel/helper-module-imports" "^7.10.4"
"@babel/helper-replace-supers" "^7.10.4"
"@babel/helper-simple-access" "^7.10.4"
- "@babel/helper-split-export-declaration" "^7.10.4"
+ "@babel/helper-split-export-declaration" "^7.11.0"
"@babel/template" "^7.10.4"
- "@babel/types" "^7.10.5"
+ "@babel/types" "^7.11.0"
lodash "^4.17.19"
"@babel/helper-optimise-call-expression@^7.10.4":
@@ -170,7 +186,7 @@
dependencies:
"@babel/types" "^7.10.4"
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
version "7.10.4"
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
@@ -211,6 +227,13 @@
"@babel/template" "^7.10.4"
"@babel/types" "^7.10.4"
+"@babel/helper-skip-transparent-expression-wrappers@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz#eec162f112c2f58d3af0af125e3bb57665146729"
+ integrity sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==
+ dependencies:
+ "@babel/types" "^7.11.0"
+
"@babel/helper-split-export-declaration@^7.10.4":
version "7.10.4"
resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz#2c70576eaa3b5609b24cb99db2888cc3fc4251d1"
@@ -218,6 +241,13 @@
dependencies:
"@babel/types" "^7.10.4"
+"@babel/helper-split-export-declaration@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
+ integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
+ dependencies:
+ "@babel/types" "^7.11.0"
+
"@babel/helper-validator-identifier@^7.10.4":
version "7.10.4"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
@@ -251,10 +281,10 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.10.4", "@babel/parser@^7.10.5":
- version "7.10.5"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz#e7c6bf5a7deff957cec9f04b551e2762909d826b"
- integrity sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==
+"@babel/parser@^7.10.4", "@babel/parser@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.0.tgz#a9d7e11aead25d3b422d17b2c6502c8dddef6a5d"
+ integrity sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==
"@babel/plugin-proposal-async-generator-functions@^7.10.4":
version "7.10.4"
@@ -281,6 +311,14 @@
"@babel/helper-plugin-utils" "^7.10.4"
"@babel/plugin-syntax-dynamic-import" "^7.8.0"
+"@babel/plugin-proposal-export-namespace-from@^7.10.4":
+ version "7.10.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz#570d883b91031637b3e2958eea3c438e62c05f54"
+ integrity sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
"@babel/plugin-proposal-json-strings@^7.10.4":
version "7.10.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db"
@@ -289,6 +327,14 @@
"@babel/helper-plugin-utils" "^7.10.4"
"@babel/plugin-syntax-json-strings" "^7.8.0"
+"@babel/plugin-proposal-logical-assignment-operators@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz#9f80e482c03083c87125dee10026b58527ea20c8"
+ integrity sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4":
version "7.10.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"
@@ -305,10 +351,10 @@
"@babel/helper-plugin-utils" "^7.10.4"
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
-"@babel/plugin-proposal-object-rest-spread@^7.10.4":
- version "7.10.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0"
- integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA==
+"@babel/plugin-proposal-object-rest-spread@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af"
+ integrity sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==
dependencies:
"@babel/helper-plugin-utils" "^7.10.4"
"@babel/plugin-syntax-object-rest-spread" "^7.8.0"
@@ -322,12 +368,13 @@
"@babel/helper-plugin-utils" "^7.10.4"
"@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-"@babel/plugin-proposal-optional-chaining@^7.10.4":
- version "7.10.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7"
- integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ==
+"@babel/plugin-proposal-optional-chaining@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz#de5866d0646f6afdaab8a566382fe3a221755076"
+ integrity sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==
dependencies:
"@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
"@babel/plugin-syntax-optional-chaining" "^7.8.0"
"@babel/plugin-proposal-private-methods@^7.10.1", "@babel/plugin-proposal-private-methods@^7.10.4":
@@ -367,6 +414,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
+"@babel/plugin-syntax-export-namespace-from@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+ integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-syntax-json-strings@^7.8.0":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
@@ -374,6 +428,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
+ version "7.10.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+ integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.10.4"
+
"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
@@ -622,12 +683,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.10.4"
-"@babel/plugin-transform-spread@^7.10.4":
- version "7.10.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz#4e2c85ea0d6abaee1b24dcfbbae426fe8d674cff"
- integrity sha512-1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ==
+"@babel/plugin-transform-spread@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz#fa84d300f5e4f57752fe41a6d1b3c554f13f17cc"
+ integrity sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==
dependencies:
"@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
"@babel/plugin-transform-sticky-regex@^7.10.4":
version "7.10.4"
@@ -675,30 +737,34 @@
core-js "^2.6.5"
regenerator-runtime "^0.13.4"
-"@babel/preset-env@^7.10.3":
- version "7.10.4"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.4.tgz#fbf57f9a803afd97f4f32e4f798bb62e4b2bef5f"
- integrity sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw==
+"@babel/preset-env@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.0.tgz#860ee38f2ce17ad60480c2021ba9689393efb796"
+ integrity sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==
dependencies:
- "@babel/compat-data" "^7.10.4"
+ "@babel/compat-data" "^7.11.0"
"@babel/helper-compilation-targets" "^7.10.4"
"@babel/helper-module-imports" "^7.10.4"
"@babel/helper-plugin-utils" "^7.10.4"
"@babel/plugin-proposal-async-generator-functions" "^7.10.4"
"@babel/plugin-proposal-class-properties" "^7.10.4"
"@babel/plugin-proposal-dynamic-import" "^7.10.4"
+ "@babel/plugin-proposal-export-namespace-from" "^7.10.4"
"@babel/plugin-proposal-json-strings" "^7.10.4"
+ "@babel/plugin-proposal-logical-assignment-operators" "^7.11.0"
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4"
"@babel/plugin-proposal-numeric-separator" "^7.10.4"
- "@babel/plugin-proposal-object-rest-spread" "^7.10.4"
+ "@babel/plugin-proposal-object-rest-spread" "^7.11.0"
"@babel/plugin-proposal-optional-catch-binding" "^7.10.4"
- "@babel/plugin-proposal-optional-chaining" "^7.10.4"
+ "@babel/plugin-proposal-optional-chaining" "^7.11.0"
"@babel/plugin-proposal-private-methods" "^7.10.4"
"@babel/plugin-proposal-unicode-property-regex" "^7.10.4"
"@babel/plugin-syntax-async-generators" "^7.8.0"
"@babel/plugin-syntax-class-properties" "^7.10.4"
"@babel/plugin-syntax-dynamic-import" "^7.8.0"
+ "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
"@babel/plugin-syntax-json-strings" "^7.8.0"
+ "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
"@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
"@babel/plugin-syntax-object-rest-spread" "^7.8.0"
@@ -731,14 +797,14 @@
"@babel/plugin-transform-regenerator" "^7.10.4"
"@babel/plugin-transform-reserved-words" "^7.10.4"
"@babel/plugin-transform-shorthand-properties" "^7.10.4"
- "@babel/plugin-transform-spread" "^7.10.4"
+ "@babel/plugin-transform-spread" "^7.11.0"
"@babel/plugin-transform-sticky-regex" "^7.10.4"
"@babel/plugin-transform-template-literals" "^7.10.4"
"@babel/plugin-transform-typeof-symbol" "^7.10.4"
"@babel/plugin-transform-unicode-escapes" "^7.10.4"
"@babel/plugin-transform-unicode-regex" "^7.10.4"
"@babel/preset-modules" "^0.1.3"
- "@babel/types" "^7.10.4"
+ "@babel/types" "^7.11.0"
browserslist "^4.12.0"
core-js-compat "^3.6.2"
invariant "^2.2.2"
@@ -779,25 +845,25 @@
"@babel/parser" "^7.10.4"
"@babel/types" "^7.10.4"
-"@babel/traverse@^7.10.4", "@babel/traverse@^7.10.5":
- version "7.10.5"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.5.tgz#77ce464f5b258be265af618d8fddf0536f20b564"
- integrity sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ==
+"@babel/traverse@^7.10.4", "@babel/traverse@^7.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.0.tgz#9b996ce1b98f53f7c3e4175115605d56ed07dd24"
+ integrity sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==
dependencies:
"@babel/code-frame" "^7.10.4"
- "@babel/generator" "^7.10.5"
+ "@babel/generator" "^7.11.0"
"@babel/helper-function-name" "^7.10.4"
- "@babel/helper-split-export-declaration" "^7.10.4"
- "@babel/parser" "^7.10.5"
- "@babel/types" "^7.10.5"
+ "@babel/helper-split-export-declaration" "^7.11.0"
+ "@babel/parser" "^7.11.0"
+ "@babel/types" "^7.11.0"
debug "^4.1.0"
globals "^11.1.0"
lodash "^4.17.19"
-"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.4.4":
- version "7.10.5"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz#d88ae7e2fde86bfbfe851d4d81afa70a997b5d15"
- integrity sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==
+"@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.4.4":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.0.tgz#2ae6bf1ba9ae8c3c43824e5861269871b206e90d"
+ integrity sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==
dependencies:
"@babel/helper-validator-identifier" "^7.10.4"
lodash "^4.17.19"
@@ -1199,10 +1265,10 @@ acorn@^6.4.1:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
-acorn@^7.1.1:
- version "7.1.1"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
- integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
+acorn@^7.3.1:
+ version "7.3.1"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
+ integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
after@0.8.2:
version "0.8.2"
@@ -1227,7 +1293,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5:
+ajv@^6.1.0, ajv@^6.12.2, ajv@^6.5.5:
version "6.12.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
@@ -1237,6 +1303,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5:
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
+ajv@^6.10.0, ajv@^6.10.2:
+ version "6.12.3"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
+ integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
+ dependencies:
+ fast-deep-equal "^3.1.1"
+ fast-json-stable-stringify "^2.0.0"
+ json-schema-traverse "^0.4.1"
+ uri-js "^4.2.2"
+
alameda@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/alameda/-/alameda-1.4.0.tgz#ca53cad0feb5e24994a9be859e0593e8c2d8f58c"
@@ -1269,13 +1345,6 @@ ansi-colors@^4.1.1:
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-ansi-escapes@^4.2.1:
- version "4.3.1"
- resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
- integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
- dependencies:
- type-fest "^0.11.0"
-
ansi-gray@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
@@ -1616,14 +1685,14 @@ atob@^2.1.2:
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-autoprefixer@^9.0.0, autoprefixer@^9.6.1, autoprefixer@^9.8.0, autoprefixer@^9.8.5:
- version "9.8.5"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.5.tgz#2c225de229ddafe1d1424c02791d0c3e10ccccaa"
- integrity sha512-C2p5KkumJlsTHoNv9w31NrBRgXhf6eCMteJuHZi2xhkgC+5Vm40MEtCKPhc0qdgAOhox0YPy1SQHTAky05UoKg==
+autoprefixer@^9.0.0, autoprefixer@^9.6.1, autoprefixer@^9.8.0, autoprefixer@^9.8.6:
+ version "9.8.6"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
+ integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
dependencies:
browserslist "^4.12.0"
- caniuse-lite "^1.0.30001097"
- colorette "^1.2.0"
+ caniuse-lite "^1.0.30001109"
+ colorette "^1.2.1"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^7.0.32"
@@ -1647,15 +1716,6 @@ axios@0.19.0:
follow-redirects "1.5.10"
is-buffer "^2.0.2"
-babel-eslint@^11.0.0-beta.2:
- version "11.0.0-beta.2"
- resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-11.0.0-beta.2.tgz#de1f06795aa0d8cedcf6ac943e63056f5b4a7048"
- integrity sha512-D2tunrOu04XloEdU2XVUminUu25FILlGruZmffqH5OSnLDhCheKNvUoM1ihrexdUvhizlix8bjqRnsss4V/UIQ==
- dependencies:
- eslint-scope "5.0.0"
- eslint-visitor-keys "^1.1.0"
- semver "^6.3.0"
-
babel-loader@^8.0.6:
version "8.1.0"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
@@ -1857,9 +1917,9 @@ blurhash@^1.1.3:
integrity sha512-yUhPJvXexbqbyijCIE/T2NCXcj9iNPhWmOKbPTuR/cm7Q5snXYIfnVnz6m7MWOXxODMz/Cr3UcVkRdHiuDVRDw==
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
- version "4.11.8"
- resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
- integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+ version "4.11.9"
+ resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
+ integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
boolbase@^1.0.0, boolbase@~1.0.0:
version "1.0.0"
@@ -2282,10 +2342,10 @@ caniuse-db@^1.0.30001090:
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001093.tgz#5a1cae72d94df1156f40f15d9079456e1b29d050"
integrity sha512-XqXxHR6Z9IN0BXLKMaTJ1NZ+US74cbKritholD6uaDLUWHiDj0QilpSb708wOcoGz0PmPRsXT/6zE+bjx+QSMw==
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001088, caniuse-lite@^1.0.30001097:
- version "1.0.30001099"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001099.tgz#540118fcc6842d1fde62f4ee5521d1ec6afdb40e"
- integrity sha512-sdS9A+sQTk7wKoeuZBN/YMAHVztUfVnjDi4/UV3sDE8xoh7YR12hKW+pIdB3oqKGwr9XaFL2ovfzt9w8eUI5CA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001088, caniuse-lite@^1.0.30001109:
+ version "1.0.30001109"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001109.tgz#a9f3f26a0c3753b063d7acbb48dfb9c0e46f2b19"
+ integrity sha512-4JIXRodHzdS3HdK8nSgIqXYLExOvG+D2/EenSvcub2Kp3QEADjo2v2oUn5g0n0D+UNwG9BtwKOyGcSq2qvQXvQ==
caseless@~0.12.0:
version "0.12.0"
@@ -2318,7 +2378,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2363,11 +2423,6 @@ character-reference-invalid@^1.0.0:
resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
-chardet@^0.7.0:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
- integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
chokidar@^2.0.0, chokidar@^2.1.8:
version "2.1.8"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -2448,18 +2503,6 @@ clean-stack@^2.0.0:
resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-cli-cursor@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
- integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
- dependencies:
- restore-cursor "^3.1.0"
-
-cli-width@^2.0.0:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
- integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
-
cliui@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
@@ -2624,10 +2667,10 @@ color@^3.0.0:
color-convert "^1.9.1"
color-string "^1.5.2"
-colorette@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.0.tgz#45306add826d196e8c87236ac05d797f25982e63"
- integrity sha512-soRSroY+OF/8OdA3PTQXwaDJeMc7TfknKKrxeSCencL2a4+Tx5zhxmmv7hdpCjhKBjehzp8+bwe/T68K0hpIjw==
+colorette@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+ integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
combined-stream@^1.0.6, combined-stream@~1.0.6:
version "1.0.8"
@@ -2912,7 +2955,7 @@ cross-spawn@^5.0.1:
shebang-command "^1.2.0"
which "^1.2.9"
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+cross-spawn@^6.0.0:
version "6.0.5"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -2923,6 +2966,15 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
shebang-command "^1.2.0"
which "^1.2.9"
+cross-spawn@^7.0.2:
+ version "7.0.3"
+ resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+ integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+ dependencies:
+ path-key "^3.1.0"
+ shebang-command "^2.0.0"
+ which "^2.0.1"
+
crypto-browserify@^3.11.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -2968,10 +3020,10 @@ css-has-pseudo@^0.10.0:
postcss "^7.0.6"
postcss-selector-parser "^5.0.0-rc.4"
-css-loader@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.0.0.tgz#814434d4e1e2d5f430c70e85e78268db7f3cced1"
- integrity sha512-/7d5slKnmY2S39FNifJ7JQ8MhcMM/rDIjAZ2Sc/Z8lnOWOmc10hijg28ovBtljY364pQaF01O2nj5AIBDnJ9vQ==
+css-loader@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.2.0.tgz#b57efb92ac8f0cd85bf92d89df9634ef1f51b8bf"
+ integrity sha512-ko7a9b0iFpWtk9eSI/C8IICvZeGtYnjxYjw45rJprokXj/+kBd/siX4vAIBq9Uij8Jubc4jL1EvSnTjCEwaHSw==
dependencies:
camelcase "^6.0.0"
cssesc "^3.0.0"
@@ -3297,7 +3349,7 @@ decompress@^4.0.0, decompress@^4.2.0:
pify "^2.3.0"
strip-dirs "^2.0.0"
-deep-is@~0.1.3:
+deep-is@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
@@ -3631,9 +3683,9 @@ electron-to-chromium@^1.3.483:
integrity sha512-NReBdOugu1yl8ly+0VDtiQ6Yw/1sLjnvflWq0gvY1nfUXU2PbA+1XAVuEb7ModnwL/MfUPjby7e4pAFnSHiy6Q==
elliptic@^6.0.0:
- version "6.5.2"
- resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
- integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
+ version "6.5.3"
+ resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
+ integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
dependencies:
bn.js "^4.4.0"
brorand "^1.0.1"
@@ -3747,6 +3799,13 @@ enhanced-resolve@^4.3.0:
memory-fs "^0.5.0"
tapable "^1.0.0"
+enquirer@^2.3.5:
+ version "2.3.6"
+ resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+ integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+ dependencies:
+ ansi-colors "^4.1.1"
+
entities@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
@@ -3952,10 +4011,15 @@ eslint-plugin-promise@^4.2.1:
resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
-eslint-scope@5.0.0, eslint-scope@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
- integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
+eslint-rule-composer@^0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
+ integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
+
+eslint-scope@5.1.0, eslint-scope@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
+ integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==
dependencies:
esrecurse "^4.1.0"
estraverse "^4.1.1"
@@ -3968,34 +4032,35 @@ eslint-scope@^4.0.3:
esrecurse "^4.1.0"
estraverse "^4.1.1"
-eslint-utils@^1.4.3:
- version "1.4.3"
- resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
- integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+eslint-utils@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+ integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
dependencies:
eslint-visitor-keys "^1.1.0"
-eslint-visitor-keys@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
- integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+ integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-eslint@^6.8.0:
- version "6.8.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
- integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
+eslint@^7.6.0:
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.6.0.tgz#522d67cfaea09724d96949c70e7a0550614d64d6"
+ integrity sha512-QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w==
dependencies:
"@babel/code-frame" "^7.0.0"
ajv "^6.10.0"
- chalk "^2.1.0"
- cross-spawn "^6.0.5"
+ chalk "^4.0.0"
+ cross-spawn "^7.0.2"
debug "^4.0.1"
doctrine "^3.0.0"
- eslint-scope "^5.0.0"
- eslint-utils "^1.4.3"
- eslint-visitor-keys "^1.1.0"
- espree "^6.1.2"
- esquery "^1.0.1"
+ enquirer "^2.3.5"
+ eslint-scope "^5.1.0"
+ eslint-utils "^2.1.0"
+ eslint-visitor-keys "^1.3.0"
+ espree "^7.2.0"
+ esquery "^1.2.0"
esutils "^2.0.2"
file-entry-cache "^5.0.1"
functional-red-black-tree "^1.0.1"
@@ -4004,40 +4069,38 @@ eslint@^6.8.0:
ignore "^4.0.6"
import-fresh "^3.0.0"
imurmurhash "^0.1.4"
- inquirer "^7.0.0"
is-glob "^4.0.0"
js-yaml "^3.13.1"
json-stable-stringify-without-jsonify "^1.0.1"
- levn "^0.3.0"
- lodash "^4.17.14"
+ levn "^0.4.1"
+ lodash "^4.17.19"
minimatch "^3.0.4"
- mkdirp "^0.5.1"
natural-compare "^1.4.0"
- optionator "^0.8.3"
+ optionator "^0.9.1"
progress "^2.0.0"
- regexpp "^2.0.1"
- semver "^6.1.2"
- strip-ansi "^5.2.0"
- strip-json-comments "^3.0.1"
+ regexpp "^3.1.0"
+ semver "^7.2.1"
+ strip-ansi "^6.0.0"
+ strip-json-comments "^3.1.0"
table "^5.2.3"
text-table "^0.2.0"
v8-compile-cache "^2.0.3"
-espree@^6.1.2:
- version "6.2.1"
- resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
- integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
+espree@^7.2.0:
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz#1c263d5b513dbad0ac30c4991b93ac354e948d69"
+ integrity sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g==
dependencies:
- acorn "^7.1.1"
+ acorn "^7.3.1"
acorn-jsx "^5.2.0"
- eslint-visitor-keys "^1.1.0"
+ eslint-visitor-keys "^1.3.0"
esprima@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-esquery@^1.0.1:
+esquery@^1.2.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
@@ -4217,15 +4280,6 @@ extend@3.0.2, extend@^3.0.0, extend@~3.0.2:
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-external-editor@^3.0.3:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
- integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
- dependencies:
- chardet "^0.7.0"
- iconv-lite "^0.4.24"
- tmp "^0.0.33"
-
extglob@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -4261,9 +4315,9 @@ fancy-log@^1.1.0, fancy-log@^1.3.2, fancy-log@^1.3.3:
time-stamp "^1.0.0"
fast-deep-equal@^3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
- integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+ integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
fast-glob@^2.2.6:
version "2.2.7"
@@ -4294,7 +4348,7 @@ fast-json-stable-stringify@^2.0.0:
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -4331,13 +4385,6 @@ figures@^1.3.5:
escape-string-regexp "^1.0.5"
object-assign "^4.1.0"
-figures@^3.0.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
- integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
- dependencies:
- escape-string-regexp "^1.0.5"
-
file-entry-cache@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-4.0.0.tgz#633567d15364aefe0b299e1e217735e8f3a9f6e8"
@@ -5417,10 +5464,10 @@ hex-color-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
-hls.js@^0.14.6:
- version "0.14.6"
- resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.14.6.tgz#f5ea8412ccd980fec67ec94a40b65adcc0bf75d1"
- integrity sha512-6s8L+Pzed3Gyf7wDxQNx9TP9y9clCDIPW8cQdDV7PF7npI75BbCbUZSQQclnt20442Ay1NL3vg2WXeSEYNiuAw==
+hls.js@^0.14.7:
+ version "0.14.7"
+ resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.14.7.tgz#47fbd2662b13121ab17c07aea06b1c07828240cf"
+ integrity sha512-9JY0D9nwMrfQPRWc8/kEJTKK0TYfDTzIs6Xq+gdCvasRxdvQKQ2T76rdueTkS0AsFV6sQlJN0wxbnI44aRvvUA==
dependencies:
eventemitter3 "^4.0.3"
url-toolkit "^2.1.6"
@@ -5578,7 +5625,7 @@ https-browserify@^1.0.0:
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
-iconv-lite@0.4.24, iconv-lite@^0.4.24:
+iconv-lite@0.4.24:
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -5785,25 +5832,6 @@ ini@^1.3.4, ini@^1.3.5:
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-inquirer@^7.0.0:
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
- integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
- dependencies:
- ansi-escapes "^4.2.1"
- chalk "^3.0.0"
- cli-cursor "^3.1.0"
- cli-width "^2.0.0"
- external-editor "^3.0.3"
- figures "^3.0.0"
- lodash "^4.17.15"
- mute-stream "0.0.8"
- run-async "^2.4.0"
- rxjs "^6.5.3"
- string-width "^4.1.0"
- strip-ansi "^6.0.0"
- through "^2.3.6"
-
interpret@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
@@ -6320,9 +6348,9 @@ js-base64@^2.1.8, js-base64@^2.1.9:
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
js-yaml@^3.13.1:
- version "3.13.1"
- resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
- integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+ version "3.14.0"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
+ integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
@@ -6524,13 +6552,13 @@ levenary@^1.1.1:
dependencies:
leven "^3.1.0"
-levn@^0.3.0, levn@~0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
- integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+levn@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+ integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
dependencies:
- prelude-ls "~1.1.2"
- type-check "~0.3.2"
+ prelude-ls "^1.2.1"
+ type-check "~0.4.0"
"libass-wasm@https://github.com/jellyfin/JavascriptSubtitlesOctopus#4.0.0-jf-smarttv":
version "4.0.0"
@@ -7200,11 +7228,6 @@ mime@1.4.1:
resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
-mimic-fn@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
- integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
mimic-response@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
@@ -7337,11 +7360,6 @@ mute-stdout@^1.0.0:
resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331"
integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==
-mute-stream@0.0.8:
- version "0.0.8"
- resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
- integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
nan@^2.12.1, nan@^2.13.2:
version "2.14.1"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
@@ -7740,13 +7758,6 @@ once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
dependencies:
wrappy "1"
-onetime@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
- integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
- dependencies:
- mimic-fn "^2.1.0"
-
openurl@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.1.tgz#3875b4b0ef7a52c156f0db41d4609dbb0f94b387"
@@ -7759,17 +7770,17 @@ opn@5.3.0:
dependencies:
is-wsl "^1.1.0"
-optionator@^0.8.3:
- version "0.8.3"
- resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
- integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+optionator@^0.9.1:
+ version "0.9.1"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+ integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
dependencies:
- deep-is "~0.1.3"
- fast-levenshtein "~2.0.6"
- levn "~0.3.0"
- prelude-ls "~1.1.2"
- type-check "~0.3.2"
- word-wrap "~1.2.3"
+ deep-is "^0.1.3"
+ fast-levenshtein "^2.0.6"
+ levn "^0.4.1"
+ prelude-ls "^1.2.1"
+ type-check "^0.4.0"
+ word-wrap "^1.2.3"
optipng-bin@^6.0.0:
version "6.0.0"
@@ -7811,7 +7822,7 @@ os-locale@^1.4.0:
dependencies:
lcid "^1.0.0"
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
@@ -8133,6 +8144,11 @@ path-key@^2.0.0, path-key@^2.0.1:
resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+path-key@^3.1.0:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+ integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
path-parse@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -9043,10 +9059,10 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.1
source-map "^0.6.1"
supports-color "^6.1.0"
-prelude-ls@~1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
- integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+prelude-ls@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+ integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
prepend-http@^1.0.1:
version "1.0.4"
@@ -9439,10 +9455,10 @@ regex-not@^1.0.0, regex-not@^1.0.2:
extend-shallow "^3.0.2"
safe-regex "^1.1.0"
-regexpp@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
- integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+regexpp@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+ integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
regexpu-core@^4.7.0:
version "4.7.0"
@@ -9756,14 +9772,6 @@ responselike@1.0.2:
dependencies:
lowercase-keys "^1.0.0"
-restore-cursor@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
- integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
- dependencies:
- onetime "^5.1.0"
- signal-exit "^3.0.2"
-
ret@~0.1.10:
version "0.1.15"
resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -9813,11 +9821,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
hash-base "^3.0.0"
inherits "^2.0.1"
-run-async@^2.4.0:
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
- integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
run-parallel@^1.1.9:
version "1.1.9"
resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
@@ -9842,13 +9845,6 @@ rxjs@^5.5.6:
dependencies:
symbol-observable "1.0.1"
-rxjs@^6.5.3:
- version "6.5.5"
- resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
- integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
- dependencies:
- tslib "^1.9.0"
-
safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -9963,12 +9959,12 @@ semver@7.0.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-semver@7.3.2, semver@^7.3.2:
+semver@7.3.2, semver@^7.2.1, semver@^7.3.2:
version "7.3.2"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
-semver@^6.0.0, semver@^6.1.2, semver@^6.3.0:
+semver@^6.0.0, semver@^6.3.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -10087,11 +10083,23 @@ shebang-command@^1.2.0:
dependencies:
shebang-regex "^1.0.0"
+shebang-command@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+ integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+ dependencies:
+ shebang-regex "^3.0.0"
+
shebang-regex@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+shebang-regex@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+ integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.3"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
@@ -10699,10 +10707,10 @@ strip-indent@^3.0.0:
dependencies:
min-indent "^1.0.0"
-strip-json-comments@^3.0.1:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180"
- integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==
+strip-json-comments@^3.1.0:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+ integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
strip-outer@^1.0.0:
version "1.0.1"
@@ -11110,7 +11118,7 @@ through2@^4.0.2:
dependencies:
readable-stream "3"
-through@^2.3.6, through@^2.3.8, through@~2.3.4:
+through@^2.3.8, through@~2.3.4:
version "2.3.8"
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -11145,13 +11153,6 @@ timsort@^0.3.0:
resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
-tmp@^0.0.33:
- version "0.0.33"
- resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
- integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
- dependencies:
- os-tmpdir "~1.0.2"
-
to-absolute-glob@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
@@ -11286,11 +11287,16 @@ tsconfig-paths@^3.9.0:
minimist "^1.2.0"
strip-bom "^3.0.0"
-tslib@^1.10.0, tslib@^1.9.0:
+tslib@^1.10.0:
version "1.11.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
+tslib@^1.9.0:
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
+ integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+
tty-browserify@0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -11308,17 +11314,12 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-type-check@~0.3.2:
- version "0.3.2"
- resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
- integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+type-check@^0.4.0, type-check@~0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+ integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
dependencies:
- prelude-ls "~1.1.2"
-
-type-fest@^0.11.0:
- version "0.11.0"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
- integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+ prelude-ls "^1.2.1"
type-fest@^0.13.1:
version "0.13.1"
@@ -11953,10 +11954,10 @@ webpack-stream@^5.2.1:
vinyl "^2.1.0"
webpack "^4.26.1"
-webpack@^4.26.1, webpack@^4.44.0:
- version "4.44.0"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.0.tgz#3b08f88a89470175f036f4a9496b8a0428668802"
- integrity sha512-wAuJxK123sqAw31SpkPiPW3iKHgFUiKvO7E7UZjtdExcsRe3fgav4mvoMM7vvpjLHVoJ6a0Mtp2fzkoA13e0Zw==
+webpack@^4.26.1, webpack@^4.44.1:
+ version "4.44.1"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.1.tgz#17e69fff9f321b8f117d1fda714edfc0b939cc21"
+ integrity sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==
dependencies:
"@webassemblyjs/ast" "1.9.0"
"@webassemblyjs/helper-module-context" "1.9.0"
@@ -12009,6 +12010,13 @@ which@1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
dependencies:
isexe "^2.0.0"
+which@^2.0.1:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+ integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+ dependencies:
+ isexe "^2.0.0"
+
wide-align@^1.1.0:
version "1.1.3"
resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
@@ -12016,7 +12024,7 @@ wide-align@^1.1.0:
dependencies:
string-width "^1.0.2 || 2"
-word-wrap@~1.2.3:
+word-wrap@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==