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

Merge pull request #1577 from MrTimscampi/apphost-es6

Browse source 
Migrate appHost, qualityOptions, bundle and appLoader to es6
This commit is contained in:
Anthony Lavado 2020-08-11 14:05:28 -04:00 • committed by GitHub
commit 9da5704bda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 712 additions and 746 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.eslintrc.js
View file

@ -44,6 +44,7 @@ module.exports = {
'no-unused-vars': ['error', { 'vars': 'all', 'args': 'none', 'ignoreRestSiblings': true }], 'no-unused-vars': ['error', { 'vars': 'all', 'args': 'none', 'ignoreRestSiblings': true }],
'one-var': ['error', 'never'], 'one-var': ['error', 'never'],
'padded-blocks': ['error', 'never'], 'padded-blocks': ['error', 'never'],
//'prefer-const': ['error', {'destructuring': 'all'}],
'quotes': ['error', 'single', { 'avoidEscape': true, 'allowTemplateLiterals': false }], 'quotes': ['error', 'single', { 'avoidEscape': true, 'allowTemplateLiterals': false }],
'semi': ['error'], 'semi': ['error'],
'space-before-blocks': ['error'], 'space-before-blocks': ['error'],

2
package.json
View file

@ -95,6 +95,7 @@
"src/components/alert.js", "src/components/alert.js",
"src/components/alphaPicker/alphaPicker.js", "src/components/alphaPicker/alphaPicker.js",
"src/components/appFooter/appFooter.js", "src/components/appFooter/appFooter.js",
"src/components/apphost.js",
"src/components/autoFocuser.js", "src/components/autoFocuser.js",
"src/components/backdrop/backdrop.js", "src/components/backdrop/backdrop.js",
"src/components/cardbuilder/cardBuilder.js", "src/components/cardbuilder/cardBuilder.js",
@ -162,6 +163,7 @@
"src/components/recordingcreator/seriesrecordingeditor.js", "src/components/recordingcreator/seriesrecordingeditor.js",
"src/components/recordingcreator/recordinghelper.js", "src/components/recordingcreator/recordinghelper.js",
"src/components/refreshdialog/refreshdialog.js", "src/components/refreshdialog/refreshdialog.js",
"src/components/qualityOptions.js",
"src/components/remotecontrol/remotecontrol.js", "src/components/remotecontrol/remotecontrol.js",
"src/components/sanatizefilename.js", "src/components/sanatizefilename.js",
"src/components/scrollManager.js", "src/components/scrollManager.js",

54
src/bundle.js
View file

@ -2,159 +2,159 @@
* require.js module definitions bundled by webpack * require.js module definitions bundled by webpack
*/ */
// Use define from require.js not webpack's define // Use define from require.js not webpack's define
var _define = window.define; const _define = window.define;
// fetch // fetch
var fetch = require('whatwg-fetch'); const fetch = require('whatwg-fetch');
_define('fetch', function() { _define('fetch', function() {
return fetch; return fetch;
}); });
// Blurhash // Blurhash
var blurhash = require('blurhash'); const blurhash = require('blurhash');
_define('blurhash', function() { _define('blurhash', function() {
return blurhash; return blurhash;
}); });
// query-string // query-string
var query = require('query-string'); const query = require('query-string');
_define('queryString', function() { _define('queryString', function() {
return query; return query;
}); });
// flvjs // flvjs
var flvjs = require('flv.js/dist/flv').default; const flvjs = require('flv.js/dist/flv').default;
_define('flvjs', function() { _define('flvjs', function() {
return flvjs; return flvjs;
}); });
// jstree // jstree
var jstree = require('jstree'); const jstree = require('jstree');
require('jstree/dist/themes/default/style.css'); require('jstree/dist/themes/default/style.css');
_define('jstree', function() { _define('jstree', function() {
return jstree; return jstree;
}); });
// jquery // jquery
var jquery = require('jquery'); const jquery = require('jquery');
_define('jQuery', function() { _define('jQuery', function() {
return jquery; return jquery;
}); });
// hlsjs // hlsjs
var hlsjs = require('hls.js'); const hlsjs = require('hls.js');
_define('hlsjs', function() { _define('hlsjs', function() {
return hlsjs; return hlsjs;
}); });
// howler // howler
var howler = require('howler'); const howler = require('howler');
_define('howler', function() { _define('howler', function() {
return howler; return howler;
}); });
// resize-observer-polyfill // resize-observer-polyfill
var resize = require('resize-observer-polyfill').default; const resize = require('resize-observer-polyfill').default;
_define('resize-observer-polyfill', function() { _define('resize-observer-polyfill', function() {
return resize; return resize;
}); });
// swiper // swiper
var swiper = require('swiper/js/swiper'); const swiper = require('swiper/js/swiper');
require('swiper/css/swiper.min.css'); require('swiper/css/swiper.min.css');
_define('swiper', function() { _define('swiper', function() {
return swiper; return swiper;
}); });
// sortable // sortable
var sortable = require('sortablejs').default; const sortable = require('sortablejs').default;
_define('sortable', function() { _define('sortable', function() {
return sortable; return sortable;
}); });
// webcomponents // webcomponents
var webcomponents = require('webcomponents.js/webcomponents-lite'); const webcomponents = require('webcomponents.js/webcomponents-lite');
_define('webcomponents', function() { _define('webcomponents', function() {
return webcomponents; return webcomponents;
}); });
// libass-wasm // libass-wasm
var libassWasm = require('libass-wasm'); const libassWasm = require('libass-wasm');
_define('JavascriptSubtitlesOctopus', function() { _define('JavascriptSubtitlesOctopus', function() {
return libassWasm; return libassWasm;
}); });
// material-icons // material-icons
var materialIcons = require('material-design-icons-iconfont/dist/material-design-icons.css'); const materialIcons = require('material-design-icons-iconfont/dist/material-design-icons.css');
_define('material-icons', function() { _define('material-icons', function() {
return materialIcons; return materialIcons;
}); });
// noto font // noto font
var noto = require('jellyfin-noto'); const noto = require('jellyfin-noto');
_define('jellyfin-noto', function () { _define('jellyfin-noto', function () {
return noto; return noto;
}); });
var epubjs = require('epubjs'); const epubjs = require('epubjs');
_define('epubjs', function () { _define('epubjs', function () {
return epubjs; return epubjs;
}); });
// page.js // page.js
var page = require('page'); const page = require('page');
_define('page', function() { _define('page', function() {
return page; return page;
}); });
// core-js // core-js
var polyfill = require('@babel/polyfill/dist/polyfill'); const polyfill = require('@babel/polyfill/dist/polyfill');
_define('polyfill', function () { _define('polyfill', function () {
return polyfill; return polyfill;
}); });
// domtokenlist-shim // domtokenlist-shim
var classlist = require('classlist.js'); const classlist = require('classlist.js');
_define('classlist-polyfill', function () { _define('classlist-polyfill', function () {
return classlist; return classlist;
}); });
// Date-FNS // Date-FNS
var dateFns = require('date-fns'); const dateFns = require('date-fns');
_define('date-fns', function () { _define('date-fns', function () {
return dateFns; return dateFns;
}); });
var dateFnsLocale = require('date-fns/locale'); const dateFnsLocale = require('date-fns/locale');
_define('date-fns/locale', function () { _define('date-fns/locale', function () {
return dateFnsLocale; return dateFnsLocale;
}); });
var fast_text_encoding = require('fast-text-encoding'); const fast_text_encoding = require('fast-text-encoding');
_define('fast-text-encoding', function () { _define('fast-text-encoding', function () {
return fast_text_encoding; return fast_text_encoding;
}); });
// intersection-observer // intersection-observer
var intersection_observer = require('intersection-observer'); const intersection_observer = require('intersection-observer');
_define('intersection-observer', function () { _define('intersection-observer', function () {
return intersection_observer; return intersection_observer;
}); });
// screenfull // screenfull
var screenfull = require('screenfull'); const screenfull = require('screenfull');
_define('screenfull', function () { _define('screenfull', function () {
return screenfull; return screenfull;
}); });
// headroom.js // headroom.js
var headroom = require('headroom.js/dist/headroom'); const headroom = require('headroom.js/dist/headroom');
_define('headroom', function () { _define('headroom', function () {
return headroom; return headroom;
}); });
// apiclient // apiclient
var apiclient = require('jellyfin-apiclient'); const apiclient = require('jellyfin-apiclient');
_define('apiclient', function () { _define('apiclient', function () {
return apiclient.ApiClient; return apiclient.ApiClient;

14
src/components/actionSheet/actionSheet.js
View file

@ -9,14 +9,14 @@ import 'scrollStyles';
import 'listViewStyle'; import 'listViewStyle';
function getOffsets(elems) { function getOffsets(elems) {
let results = []; const results = [];
if (!document) { if (!document) {
return results; return results;
} }
for (const elem of elems) { for (const elem of elems) {
let box = elem.getBoundingClientRect(); const box = elem.getBoundingClientRect();
results.push({ results.push({
top: box.top, top: box.top,
@ -34,7 +34,7 @@ function getPosition(options, dlg) {
const windowHeight = windowSize.innerHeight; const windowHeight = windowSize.innerHeight;
const windowWidth = windowSize.innerWidth; const windowWidth = windowSize.innerWidth;
let pos = getOffsets([options.positionTo])[0]; const pos = getOffsets([options.positionTo])[0];
if (options.positionY !== 'top') { if (options.positionY !== 'top') {
pos.top += (pos.height || 0) / 2; pos.top += (pos.height || 0) / 2;
@ -82,7 +82,7 @@ export function show(options) {
// positionTo // positionTo
// showCancel // showCancel
// title // title
let dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
enableHistory: options.enableHistory, enableHistory: options.enableHistory,
scrollY: false scrollY: false
@ -103,7 +103,7 @@ export function show(options) {
dialogOptions.autoFocus = false; dialogOptions.autoFocus = false;
} }
let dlg = dialogHelper.createDialog(dialogOptions); const dlg = dialogHelper.createDialog(dialogOptions);
if (isFullscreen) { if (isFullscreen) {
dlg.classList.add('actionsheet-fullscreen'); dlg.classList.add('actionsheet-fullscreen');
@ -129,7 +129,7 @@ export function show(options) {
} }
let renderIcon = false; let renderIcon = false;
let icons = []; const icons = [];
let itemIcon; let itemIcon;
for (const item of options.items) { for (const item of options.items) {
itemIcon = item.icon || (item.selected ? 'check' : null); itemIcon = item.icon || (item.selected ? 'check' : null);
@ -241,7 +241,7 @@ export function show(options) {
centerFocus(dlg.querySelector('.actionSheetScroller'), false, true); centerFocus(dlg.querySelector('.actionSheetScroller'), false, true);
} }
let btnCloseActionSheet = dlg.querySelector('.btnCloseActionSheet'); const btnCloseActionSheet = dlg.querySelector('.btnCloseActionSheet');
if (btnCloseActionSheet) { if (btnCloseActionSheet) {
btnCloseActionSheet.addEventListener('click', function () { btnCloseActionSheet.addEventListener('click', function () {
dialogHelper.close(dlg); dialogHelper.close(dlg);

1
src/components/appRouter.js
View file

@ -1,6 +1,7 @@
define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdrop', 'browser', 'page', 'appSettings', 'apphost', 'connectionManager'], function (loading, globalize, events, viewManager, skinManager, backdrop, browser, page, appSettings, appHost, connectionManager) { define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdrop', 'browser', 'page', 'appSettings', 'apphost', 'connectionManager'], function (loading, globalize, events, viewManager, skinManager, backdrop, browser, page, appSettings, appHost, connectionManager) {
'use strict'; 'use strict';
appHost = appHost.default || appHost;
viewManager = viewManager.default || viewManager; viewManager = viewManager.default || viewManager;
browser = browser.default || browser; browser = browser.default || browser;
loading = loading.default || loading; loading = loading.default || loading;

755
src/components/apphost.js
View file

@ -1,447 +1,412 @@
define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'globalize'], function (appSettings, browser, events, htmlMediaHelper, webSettings, globalize) { import appSettings from 'appSettings';
'use strict'; import browser from 'browser';
import events from 'events';
import * as htmlMediaHelper from 'htmlMediaHelper';
import * as webSettings from 'webSettings';
import globalize from 'globalize';
browser = browser.default || browser; function getBaseProfileOptions(item) {
const disableHlsVideoAudioCodecs = [];
function getBaseProfileOptions(item) { if (item && htmlMediaHelper.enableHlsJsPlayer(item.RunTimeTicks, item.MediaType)) {
var disableHlsVideoAudioCodecs = []; if (browser.edge) {
disableHlsVideoAudioCodecs.push('mp3');
}
if (item && htmlMediaHelper.enableHlsJsPlayer(item.RunTimeTicks, item.MediaType)) { disableHlsVideoAudioCodecs.push('ac3');
if (browser.edge) { disableHlsVideoAudioCodecs.push('eac3');
disableHlsVideoAudioCodecs.push('mp3'); disableHlsVideoAudioCodecs.push('opus');
}
return {
enableMkvProgressive: false,
disableHlsVideoAudioCodecs: disableHlsVideoAudioCodecs
};
}
function getDeviceProfile(item, options = {}) {
return new Promise(function (resolve) {
import('browserdeviceprofile').then(({default: profileBuilder}) => {
let profile;
if (window.NativeShell) {
profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder);
} else {
const builderOpts = getBaseProfileOptions(item);
builderOpts.enableSsaRender = (item && !options.isRetry && appSettings.get('subtitleburnin') !== 'allcomplexformats');
profile = profileBuilder(builderOpts);
} }
disableHlsVideoAudioCodecs.push('ac3'); resolve(profile);
disableHlsVideoAudioCodecs.push('eac3');
disableHlsVideoAudioCodecs.push('opus');
}
return {
enableMkvProgressive: false,
disableHlsVideoAudioCodecs: disableHlsVideoAudioCodecs
};
}
function getDeviceProfileForWindowsUwp(item) {
return new Promise(function (resolve, reject) {
require(['browserdeviceprofile', 'environments/windows-uwp/mediacaps'], function (profileBuilder, uwpMediaCaps) {
var profileOptions = getBaseProfileOptions(item);
profileOptions.supportsDts = uwpMediaCaps.supportsDTS();
profileOptions.supportsTrueHd = uwpMediaCaps.supportsDolby();
profileOptions.audioChannels = uwpMediaCaps.getAudioChannels();
resolve(profileBuilder(profileOptions));
});
}); });
});
}
function escapeRegExp(str) {
return str.replace(/([.*+?^=!:${}()|[\]/\\])/g, '\\$1');
}
function replaceAll(originalString, strReplace, strWith) {
const strReplace2 = escapeRegExp(strReplace);
const reg = new RegExp(strReplace2, 'ig');
return originalString.replace(reg, strWith);
}
function generateDeviceId() {
const keys = [];
if (keys.push(navigator.userAgent), keys.push(new Date().getTime()), self.btoa) {
const result = replaceAll(btoa(keys.join('|')), '=', '1');
return Promise.resolve(result);
} }
function getDeviceProfile(item, options) { return Promise.resolve(new Date().getTime());
options = options || {}; }
if (self.Windows) { function getDeviceId() {
return getDeviceProfileForWindowsUwp(item); const key = '_deviceId2';
} const deviceId = appSettings.get(key);
return new Promise(function (resolve) { if (deviceId) {
require(['browserdeviceprofile'], function (profileBuilder) { return Promise.resolve(deviceId);
var profile;
if (window.NativeShell) {
profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder);
} else {
var builderOpts = getBaseProfileOptions(item);
builderOpts.enableSsaRender = (item && !options.isRetry && appSettings.get('subtitleburnin') !== 'allcomplexformats');
profile = profileBuilder(builderOpts);
}
resolve(profile);
});
});
} }
function escapeRegExp(str) { return generateDeviceId().then(function (deviceId) {
return str.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, '\\$1'); appSettings.set(key, deviceId);
return deviceId;
});
}
function getDeviceName() {
var deviceName;
if (browser.tizen) {
deviceName = 'Samsung Smart TV';
} else if (browser.web0s) {
deviceName = 'LG Smart TV';
} else if (browser.operaTv) {
deviceName = 'Opera TV';
} else if (browser.xboxOne) {
deviceName = 'Xbox One';
} else if (browser.ps4) {
deviceName = 'Sony PS4';
} else if (browser.chrome) {
deviceName = 'Chrome';
} else if (browser.edgeChromium) {
deviceName = 'Edge Chromium';
} else if (browser.edge) {
deviceName = 'Edge';
} else if (browser.firefox) {
deviceName = 'Firefox';
} else if (browser.opera) {
deviceName = 'Opera';
} else if (browser.safari) {
deviceName = 'Safari';
} else {
deviceName = 'Web Browser';
} }
function replaceAll(originalString, strReplace, strWith) { if (browser.ipad) {
var strReplace2 = escapeRegExp(strReplace); deviceName += ' iPad';
var reg = new RegExp(strReplace2, 'ig'); } else if (browser.iphone) {
return originalString.replace(reg, strWith); deviceName += ' iPhone';
} else if (browser.android) {
deviceName += ' Android';
} }
function generateDeviceId() { return deviceName;
var keys = []; }
if (keys.push(navigator.userAgent), keys.push(new Date().getTime()), self.btoa) { function supportsVoiceInput() {
var result = replaceAll(btoa(keys.join('|')), '=', '1'); if (!browser.tv) {
return Promise.resolve(result); return window.SpeechRecognition || window.webkitSpeechRecognition || window.mozSpeechRecognition || window.oSpeechRecognition || window.msSpeechRecognition;
}
return Promise.resolve(new Date().getTime());
} }
function getDeviceId() { return false;
var key = '_deviceId2'; }
var deviceId = appSettings.get(key);
if (deviceId) {
return Promise.resolve(deviceId);
}
return generateDeviceId().then(function (deviceId) {
appSettings.set(key, deviceId);
return deviceId;
});
}
function getDeviceName() {
var deviceName;
if (browser.tizen) {
deviceName = 'Samsung Smart TV';
} else if (browser.web0s) {
deviceName = 'LG Smart TV';
} else if (browser.operaTv) {
deviceName = 'Opera TV';
} else if (browser.xboxOne) {
deviceName = 'Xbox One';
} else if (browser.ps4) {
deviceName = 'Sony PS4';
} else if (browser.chrome) {
deviceName = 'Chrome';
} else if (browser.edgeChromium) {
deviceName = 'Edge Chromium';
} else if (browser.edge) {
deviceName = 'Edge';
} else if (browser.firefox) {
deviceName = 'Firefox';
} else if (browser.opera) {
deviceName = 'Opera';
} else if (browser.safari) {
deviceName = 'Safari';
} else {
deviceName = 'Web Browser';
}
if (browser.ipad) {
deviceName += ' iPad';
} else if (browser.iphone) {
deviceName += ' iPhone';
} else if (browser.android) {
deviceName += ' Android';
}
return deviceName;
}
function supportsVoiceInput() {
if (!browser.tv) {
return window.SpeechRecognition || window.webkitSpeechRecognition || window.mozSpeechRecognition || window.oSpeechRecognition || window.msSpeechRecognition;
}
function supportsFullscreen() {
if (browser.tv) {
return false; return false;
} }
function supportsFullscreen() { const element = document.documentElement;
if (browser.tv) { return (element.requestFullscreen || element.mozRequestFullScreen || element.webkitRequestFullscreen || element.msRequestFullscreen) || document.createElement('video').webkitEnterFullscreen;
return false; }
}
var element = document.documentElement; function getDefaultLayout() {
return (element.requestFullscreen || element.mozRequestFullScreen || element.webkitRequestFullscreen || element.msRequestFullscreen) || document.createElement('video').webkitEnterFullscreen; return 'desktop';
} }
function getSyncProfile() {
return new Promise(function (resolve) {
require(['browserdeviceprofile', 'appSettings'], function (profileBuilder, appSettings) {
var profile;
if (window.NativeShell) {
profile = window.NativeShell.AppHost.getSyncProfile(profileBuilder, appSettings);
} else {
profile = profileBuilder();
profile.MaxStaticMusicBitrate = appSettings.maxStaticMusicBitrate();
}
resolve(profile);
});
});
}
function getDefaultLayout() {
return 'desktop';
}
function supportsHtmlMediaAutoplay() {
if (browser.edgeUwp || browser.tizen || browser.web0s || browser.orsay || browser.operaTv || browser.ps4 || browser.xboxOne) {
return true;
}
if (browser.mobile) {
return false;
}
function supportsHtmlMediaAutoplay() {
if (browser.edgeUwp || browser.tizen || browser.web0s || browser.orsay || browser.operaTv || browser.ps4 || browser.xboxOne) {
return true; return true;
} }
function supportsCue() { if (browser.mobile) {
try { return false;
var video = document.createElement('video');
var style = document.createElement('style');
style.textContent = 'video::cue {background: inherit}';
document.body.appendChild(style);
document.body.appendChild(video);
var cue = window.getComputedStyle(video, '::cue').background;
document.body.removeChild(style);
document.body.removeChild(video);
return !!cue.length;
} catch (err) {
console.error('error detecting cue support: ' + err);
return false;
}
} }
function onAppVisible() { return true;
if (isHidden) { }
isHidden = false;
console.debug('triggering app resume event'); function supportsCue() {
events.trigger(appHost, 'resume'); try {
} const video = document.createElement('video');
const style = document.createElement('style');
style.textContent = 'video::cue {background: inherit}';
document.body.appendChild(style);
document.body.appendChild(video);
const cue = window.getComputedStyle(video, '::cue').background;
document.body.removeChild(style);
document.body.removeChild(video);
return !!cue.length;
} catch (err) {
console.error('error detecting cue support: ' + err);
return false;
}
}
function onAppVisible() {
if (isHidden) {
isHidden = false;
console.debug('triggering app resume event');
events.trigger(appHost, 'resume');
}
}
function onAppHidden() {
if (!isHidden) {
isHidden = true;
console.debug('app is hidden');
}
}
const supportedFeatures = function () {
const features = [];
if (navigator.share) {
features.push('sharing');
} }
function onAppHidden() { if (!browser.edgeUwp && !browser.tv && !browser.xboxOne && !browser.ps4) {
if (!isHidden) { features.push('filedownload');
isHidden = true;
console.debug('app is hidden');
}
} }
var supportedFeatures = function () { if (browser.operaTv || browser.tizen || browser.orsay || browser.web0s) {
var features = []; features.push('exit');
} else {
features.push('exitmenu');
features.push('plugins');
}
if (navigator.share) { if (!browser.operaTv && !browser.tizen && !browser.orsay && !browser.web0s && !browser.ps4) {
features.push('sharing'); features.push('externallinks');
} features.push('externalpremium');
}
if (!browser.edgeUwp && !browser.tv && !browser.xboxOne && !browser.ps4) { if (!browser.operaTv) {
features.push('filedownload'); features.push('externallinkdisplay');
} }
if (browser.operaTv || browser.tizen || browser.orsay || browser.web0s) { if (supportsVoiceInput()) {
features.push('exit'); features.push('voiceinput');
}
if (supportsHtmlMediaAutoplay()) {
features.push('htmlaudioautoplay');
features.push('htmlvideoautoplay');
}
if (browser.edgeUwp) {
features.push('sync');
}
if (supportsFullscreen()) {
features.push('fullscreenchange');
}
if (browser.tv || browser.xboxOne || browser.ps4 || browser.mobile) {
features.push('physicalvolumecontrol');
}
if (!browser.tv && !browser.xboxOne && !browser.ps4) {
features.push('remotecontrol');
}
if (!browser.operaTv && !browser.tizen && !browser.orsay && !browser.web0s && !browser.edgeUwp) {
features.push('remotevideo');
}
features.push('displaylanguage');
features.push('otherapppromotions');
features.push('displaymode');
features.push('targetblank');
features.push('screensaver');
webSettings.getMultiServer().then(enabled => {
if (enabled) features.push('multiserver');
});
if (!browser.orsay && (browser.firefox || browser.ps4 || browser.edge || supportsCue())) {
features.push('subtitleappearancesettings');
}
if (!browser.orsay) {
features.push('subtitleburnsettings');
}
if (!browser.tv && !browser.ps4 && !browser.xboxOne) {
features.push('fileinput');
}
if (browser.chrome || browser.edgeChromium) {
features.push('chromecast');
}
return features;
}();
/**
* Do exit according to platform
*/
function doExit() {
try {
if (window.NativeShell) {
window.NativeShell.AppHost.exit();
} else if (browser.tizen) {
tizen.application.getCurrentApplication().exit();
} else if (browser.web0s) {
webOS.platformBack();
} else { } else {
features.push('exitmenu'); window.close();
features.push('plugins');
} }
} catch (err) {
console.error('error closing application: ' + err);
}
}
if (!browser.operaTv && !browser.tizen && !browser.orsay && !browser.web0s && !browser.ps4) { let exitPromise;
features.push('externallinks');
features.push('externalpremium');
}
if (!browser.operaTv) { /**
features.push('externallinkdisplay'); * Ask user for exit
} */
function askForExit() {
if (supportsVoiceInput()) { if (exitPromise) {
features.push('voiceinput'); return;
}
if (supportsHtmlMediaAutoplay()) {
features.push('htmlaudioautoplay');
features.push('htmlvideoautoplay');
}
if (browser.edgeUwp) {
features.push('sync');
}
if (supportsFullscreen()) {
features.push('fullscreenchange');
}
if (browser.tv || browser.xboxOne || browser.ps4 || browser.mobile) {
features.push('physicalvolumecontrol');
}
if (!browser.tv && !browser.xboxOne && !browser.ps4) {
features.push('remotecontrol');
}
if (!browser.operaTv && !browser.tizen && !browser.orsay && !browser.web0s && !browser.edgeUwp) {
features.push('remotevideo');
}
features.push('displaylanguage');
features.push('otherapppromotions');
features.push('displaymode');
features.push('targetblank');
features.push('screensaver');
webSettings.getMultiServer().then(enabled => {
if (enabled) features.push('multiserver');
});
if (!browser.orsay && (browser.firefox || browser.ps4 || browser.edge || supportsCue())) {
features.push('subtitleappearancesettings');
}
if (!browser.orsay) {
features.push('subtitleburnsettings');
}
if (!browser.tv && !browser.ps4 && !browser.xboxOne) {
features.push('fileinput');
}
if (browser.chrome || browser.edgeChromium) {
features.push('chromecast');
}
return features;
}();
/**
* Do exit according to platform
*/
function doExit() {
try {
if (window.NativeShell) {
window.NativeShell.AppHost.exit();
} else if (browser.tizen) {
tizen.application.getCurrentApplication().exit();
} else if (browser.web0s) {
webOS.platformBack();
} else {
window.close();
}
} catch (err) {
console.error('error closing application: ' + err);
}
} }
var exitPromise; import('actionsheet').then(({default: actionsheet}) => {
exitPromise = actionsheet.show({
/** title: globalize.translate('MessageConfirmAppExit'),
* Ask user for exit items: [
*/ {id: 'yes', name: globalize.translate('Yes')},
function askForExit() { {id: 'no', name: globalize.translate('No')}
if (exitPromise) { ]
return; }).then(function (value) {
} if (value === 'yes') {
require(['actionsheet'], function (actionsheet) {
exitPromise = actionsheet.show({
title: globalize.translate('MessageConfirmAppExit'),
items: [
{id: 'yes', name: globalize.translate('Yes')},
{id: 'no', name: globalize.translate('No')}
]
}).then(function (value) {
if (value === 'yes') {
doExit();
}
}).finally(function () {
exitPromise = null;
});
});
}
var deviceId;
var deviceName;
var appName = 'Jellyfin Web';
var appVersion = '10.7.0';
var appHost = {
getWindowState: function () {
return document.windowState || 'Normal';
},
setWindowState: function (state) {
alert('setWindowState is not supported and should not be called');
},
exit: function () {
if (!!window.appMode && browser.tizen) {
askForExit();
} else {
doExit(); doExit();
} }
}, }).finally(function () {
supports: function (command) { exitPromise = null;
if (window.NativeShell) { });
return window.NativeShell.AppHost.supports(command); });
} }
return supportedFeatures.indexOf(command.toLowerCase()) !== -1; let deviceId;
}, let deviceName;
preferVisualCards: browser.android || browser.chrome, const appName = 'Jellyfin Web';
getSyncProfile: getSyncProfile, const appVersion = '10.7.0';
getDefaultLayout: function () {
if (window.NativeShell) {
return window.NativeShell.AppHost.getDefaultLayout();
}
return getDefaultLayout(); const appHost = {
}, getWindowState: function () {
getDeviceProfile: getDeviceProfile, return document.windowState || 'Normal';
init: function () { },
if (window.NativeShell) { setWindowState: function () {
return window.NativeShell.AppHost.init(); alert('setWindowState is not supported and should not be called');
} },
exit: function () {
deviceName = getDeviceName(); if (!!window.appMode && browser.tizen) {
getDeviceId().then(function (id) { askForExit();
deviceId = id;
});
},
deviceName: function () {
return window.NativeShell ? window.NativeShell.AppHost.deviceName() : deviceName;
},
deviceId: function () {
return window.NativeShell ? window.NativeShell.AppHost.deviceId() : deviceId;
},
appName: function () {
return window.NativeShell ? window.NativeShell.AppHost.appName() : appName;
},
appVersion: function () {
return window.NativeShell ? window.NativeShell.AppHost.appVersion() : appVersion;
},
getPushTokenInfo: function () {
return {};
},
setUserScalable: function (scalable) {
if (!browser.tv) {
var att = scalable ? 'width=device-width, initial-scale=1, minimum-scale=1, user-scalable=yes' : 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no';
document.querySelector('meta[name=viewport]').setAttribute('content', att);
}
}
};
var isHidden = false;
var hidden;
var visibilityChange;
if (typeof document.hidden !== 'undefined') { /* eslint-disable-line compat/compat */
hidden = 'hidden';
visibilityChange = 'visibilitychange';
} else if (typeof document.webkitHidden !== 'undefined') {
hidden = 'webkitHidden';
visibilityChange = 'webkitvisibilitychange';
}
document.addEventListener(visibilityChange, function () {
/* eslint-disable-next-line compat/compat */
if (document[hidden]) {
onAppHidden();
} else { } else {
onAppVisible(); doExit();
}
},
supports: function (command) {
if (window.NativeShell) {
return window.NativeShell.AppHost.supports(command);
} }
}, false);
if (self.addEventListener) { return supportedFeatures.indexOf(command.toLowerCase()) !== -1;
self.addEventListener('focus', onAppVisible); },
self.addEventListener('blur', onAppHidden); preferVisualCards: browser.android || browser.chrome,
getDefaultLayout: function () {
if (window.NativeShell) {
return window.NativeShell.AppHost.getDefaultLayout();
}
return getDefaultLayout();
},
getDeviceProfile: getDeviceProfile,
init: function () {
if (window.NativeShell) {
return window.NativeShell.AppHost.init();
}
deviceName = getDeviceName();
getDeviceId().then(function (id) {
deviceId = id;
});
},
deviceName: function () {
return window.NativeShell ? window.NativeShell.AppHost.deviceName() : deviceName;
},
deviceId: function () {
return window.NativeShell ? window.NativeShell.AppHost.deviceId() : deviceId;
},
appName: function () {
return window.NativeShell ? window.NativeShell.AppHost.appName() : appName;
},
appVersion: function () {
return window.NativeShell ? window.NativeShell.AppHost.appVersion() : appVersion;
},
getPushTokenInfo: function () {
return {};
},
setUserScalable: function (scalable) {
if (!browser.tv) {
const att = scalable ? 'width=device-width, initial-scale=1, minimum-scale=1, user-scalable=yes' : 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no';
document.querySelector('meta[name=viewport]').setAttribute('content', att);
}
} }
};
return appHost; let isHidden = false;
}); let hidden;
let visibilityChange;
if (typeof document.hidden !== 'undefined') { /* eslint-disable-line compat/compat */
hidden = 'hidden';
visibilityChange = 'visibilitychange';
} else if (typeof document.webkitHidden !== 'undefined') {
hidden = 'webkitHidden';
visibilityChange = 'webkitvisibilitychange';
}
document.addEventListener(visibilityChange, function () {
/* eslint-disable-next-line compat/compat */
if (document[hidden]) {
onAppHidden();
} else {
onAppVisible();
}
}, false);
if (self.addEventListener) {
self.addEventListener('focus', onAppVisible);
self.addEventListener('blur', onAppHidden);
}
export default appHost;

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

@ -362,12 +362,12 @@ import 'programStyles';
let hasOpenRow; let hasOpenRow;
let hasOpenSection; let hasOpenSection;
let sectionTitleTagName = options.sectionTitleTagName || 'div'; const sectionTitleTagName = options.sectionTitleTagName || 'div';
let apiClient; let apiClient;
let lastServerId; let lastServerId;
for (const [i, item] of items.entries()) { for (const [i, item] of items.entries()) {
let serverId = item.ServerId || options.serverId; const serverId = item.ServerId || options.serverId;
if (serverId !== lastServerId) { if (serverId !== lastServerId) {
lastServerId = serverId; lastServerId = serverId;
@ -621,7 +621,7 @@ import 'programStyles';
}); });
} }
let blurHashes = options.imageBlurhashes || item.ImageBlurHashes || {}; const blurHashes = options.imageBlurhashes || item.ImageBlurHashes || {};
return { return {
imgUrl: imgUrl, imgUrl: imgUrl,
@ -656,7 +656,7 @@ import 'programStyles';
for (let i = 0; i < character.length; i++) { for (let i = 0; i < character.length; i++) {
sum += parseInt(character.charAt(i)); sum += parseInt(character.charAt(i));
} }
let index = String(sum).substr(-1); const index = String(sum).substr(-1);
return (index % numRandomColors) + 1; return (index % numRandomColors) + 1;
} else { } else {
@ -682,7 +682,7 @@ import 'programStyles';
for (let i = 0; i < lines.length; i++) { for (let i = 0; i < lines.length; i++) {
let currentCssClass = cssClass; let currentCssClass = cssClass;
let text = lines[i]; const text = lines[i];
if (valid > 0 && isOuterFooter) { if (valid > 0 && isOuterFooter) {
currentCssClass += ' cardText-secondary'; currentCssClass += ' cardText-secondary';
@ -707,7 +707,7 @@ import 'programStyles';
} }
if (forceLines) { if (forceLines) {
let linesLength = maxLines || Math.min(lines.length, maxLines || lines.length); const linesLength = maxLines || Math.min(lines.length, maxLines || lines.length);
while (valid < linesLength) { while (valid < linesLength) {
html += "<div class='" + cssClass + "'>&nbsp;</div>"; html += "<div class='" + cssClass + "'>&nbsp;</div>";
@ -1036,7 +1036,7 @@ import 'programStyles';
* @returns {string} HTML markup for the item count indicator. * @returns {string} HTML markup for the item count indicator.
*/ */
function getItemCountsHtml(options, item) { function getItemCountsHtml(options, item) {
let counts = []; const counts = [];
let childText; let childText;
if (item.Type === 'Playlist') { if (item.Type === 'Playlist') {
@ -1318,7 +1318,7 @@ import 'programStyles';
let cardBoxClose = ''; let cardBoxClose = '';
let cardScalableClose = ''; let cardScalableClose = '';
let cardContentClass = 'cardContent'; const cardContentClass = 'cardContent';
let blurhashAttrib = ''; let blurhashAttrib = '';
if (blurhash && blurhash.length > 0) { if (blurhash && blurhash.length > 0) {
@ -1337,7 +1337,7 @@ import 'programStyles';
cardImageContainerClose = '</button>'; cardImageContainerClose = '</button>';
} }
let cardScalableClass = 'cardScalable'; const cardScalableClass = 'cardScalable';
cardImageContainerOpen = '<div class="' + cardBoxClass + '"><div class="' + cardScalableClass + '"><div class="cardPadder cardPadder-' + shape + '"></div>' + cardImageContainerOpen; cardImageContainerOpen = '<div class="' + cardBoxClass + '"><div class="' + cardScalableClass + '"><div class="cardPadder cardPadder-' + shape + '"></div>' + cardImageContainerOpen;
cardBoxClose = '</div>'; cardBoxClose = '</div>';
@ -1681,7 +1681,7 @@ import 'programStyles';
const cells = itemsContainer.querySelectorAll('.card[data-id="' + programId + '"]'); const cells = itemsContainer.querySelectorAll('.card[data-id="' + programId + '"]');
for (let i = 0, length = cells.length; i < length; i++) { for (let i = 0, length = cells.length; i < length; i++) {
let cell = cells[i]; const cell = cells[i];
const icon = cell.querySelector('.timerIndicator'); const icon = cell.querySelector('.timerIndicator');
if (!icon) { if (!icon) {
const indicatorsElem = ensureIndicators(cell); const indicatorsElem = ensureIndicators(cell);
@ -1700,8 +1700,8 @@ import 'programStyles';
const cells = itemsContainer.querySelectorAll('.card[data-timerid="' + timerId + '"]'); const cells = itemsContainer.querySelectorAll('.card[data-timerid="' + timerId + '"]');
for (let i = 0; i < cells.length; i++) { for (let i = 0; i < cells.length; i++) {
let cell = cells[i]; const cell = cells[i];
let icon = cell.querySelector('.timerIndicator'); const icon = cell.querySelector('.timerIndicator');
if (icon) { if (icon) {
icon.parentNode.removeChild(icon); icon.parentNode.removeChild(icon);
} }
@ -1718,8 +1718,8 @@ import 'programStyles';
const cells = itemsContainer.querySelectorAll('.card[data-seriestimerid="' + cancelledTimerId + '"]'); const cells = itemsContainer.querySelectorAll('.card[data-seriestimerid="' + cancelledTimerId + '"]');
for (let i = 0; i < cells.length; i++) { for (let i = 0; i < cells.length; i++) {
let cell = cells[i]; const cell = cells[i];
let icon = cell.querySelector('.timerIndicator'); const icon = cell.querySelector('.timerIndicator');
if (icon) { if (icon) {
icon.parentNode.removeChild(icon); icon.parentNode.removeChild(icon);
} }

7
src/components/dialogHelper/dialogHelper.js
View file

@ -391,11 +391,8 @@ import 'scrollStyles';
dlg.setAttribute('data-autofocus', 'true'); dlg.setAttribute('data-autofocus', 'true');
} }
let defaultEntryAnimation; const defaultEntryAnimation = 'scaleup';
let defaultExitAnimation; const defaultExitAnimation = 'scaledown';
defaultEntryAnimation = 'scaleup';
defaultExitAnimation = 'scaledown';
const entryAnimation = options.entryAnimation || defaultEntryAnimation; const entryAnimation = options.entryAnimation || defaultEntryAnimation;
const exitAnimation = options.exitAnimation || defaultExitAnimation; const exitAnimation = options.exitAnimation || defaultExitAnimation;

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

@ -17,8 +17,8 @@ import 'css!./style';
// Although the default values recommended by Blurhash developers is 32x32, a size of 18x18 seems to be the sweet spot for us, // Although the default values recommended by Blurhash developers is 32x32, a size of 18x18 seems to be the sweet spot for us,
// improving the performance and reducing the memory usage, while retaining almost full blur quality. // improving the performance and reducing the memory usage, while retaining almost full blur quality.
// Lower values had more visible pixelation // Lower values had more visible pixelation
let width = 18; const width = 18;
let height = 18; const height = 18;
let pixels; let pixels;
try { try {
pixels = blurhash.decode(blurhashstr, width, height); pixels = blurhash.decode(blurhashstr, width, height);
@ -27,11 +27,11 @@ import 'css!./style';
target.classList.add('non-blurhashable'); target.classList.add('non-blurhashable');
return; return;
} }
let canvas = document.createElement('canvas'); const canvas = document.createElement('canvas');
canvas.width = width; canvas.width = width;
canvas.height = height; canvas.height = height;
let ctx = canvas.getContext('2d'); const ctx = canvas.getContext('2d');
let imgData = ctx.createImageData(width, height); const imgData = ctx.createImageData(width, height);
imgData.data.set(pixels); imgData.data.set(pixels);
ctx.putImageData(imgData, 0, 0); ctx.putImageData(imgData, 0, 0);
@ -55,7 +55,7 @@ import 'css!./style';
if (!entry) { if (!entry) {
throw new Error('entry cannot be null'); throw new Error('entry cannot be null');
} }
let target = entry.target; const target = entry.target;
var source = undefined; var source = undefined;
if (target) { if (target) {
@ -78,7 +78,7 @@ import 'css!./style';
throw new TypeError('url cannot be undefined'); throw new TypeError('url cannot be undefined');
} }
let preloaderImg = new Image(); const preloaderImg = new Image();
preloaderImg.src = url; preloaderImg.src = url;
elem.classList.add('lazy-hidden'); elem.classList.add('lazy-hidden');

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

@ -82,7 +82,7 @@ export function enablePlayedIndicator(item) {
export function getPlayedIndicatorHtml(item) { export function getPlayedIndicatorHtml(item) {
if (enablePlayedIndicator(item)) { if (enablePlayedIndicator(item)) {
let userData = item.UserData || {}; const userData = item.UserData || {};
if (userData.UnplayedItemCount) { if (userData.UnplayedItemCount) {
return '<div class="countIndicator indicator">' + userData.UnplayedItemCount + '</div>'; return '<div class="countIndicator indicator">' + userData.UnplayedItemCount + '</div>';
} }

4
src/components/itemContextMenu.js
View file

@ -16,7 +16,7 @@ import actionsheet from 'actionsheet';
const canPlay = playbackManager.canPlay(item); const canPlay = playbackManager.canPlay(item);
const restrictOptions = (browser.operaTv || browser.web0s) && !user.Policy.IsAdministrator; const restrictOptions = (browser.operaTv || browser.web0s) && !user.Policy.IsAdministrator;
let commands = []; const commands = [];
if (canPlay && item.MediaType !== 'Photo') { if (canPlay && item.MediaType !== 'Photo') {
if (options.play !== false) { if (options.play !== false) {
@ -367,7 +367,7 @@ import actionsheet from 'actionsheet';
case 'copy-stream': { case 'copy-stream': {
const downloadHref = apiClient.getItemDownloadUrl(itemId); const downloadHref = apiClient.getItemDownloadUrl(itemId);
const textAreaCopy = function () { const textAreaCopy = function () {
let textArea = document.createElement('textarea'); const textArea = document.createElement('textarea');
textArea.value = downloadHref; textArea.value = downloadHref;
document.body.appendChild(textArea); document.body.appendChild(textArea);
textArea.focus(); textArea.focus();

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

@ -906,7 +906,7 @@ import 'flexStyles';
} }
function populatePeople(context, people) { function populatePeople(context, people) {
let lastType = ''; const lastType = '';
let html = ''; let html = '';
const elem = context.querySelector('#peopleList'); const elem = context.querySelector('#peopleList');

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

@ -500,20 +500,20 @@ import 'emby-ratingbutton';
const textLines = nowPlayingItem ? nowPlayingHelper.getNowPlayingNames(nowPlayingItem) : []; const textLines = nowPlayingItem ? nowPlayingHelper.getNowPlayingNames(nowPlayingItem) : [];
nowPlayingTextElement.innerHTML = ''; nowPlayingTextElement.innerHTML = '';
if (textLines) { if (textLines) {
let itemText = document.createElement('div'); const itemText = document.createElement('div');
let secondaryText = document.createElement('div'); const secondaryText = document.createElement('div');
secondaryText.classList.add('nowPlayingBarSecondaryText'); secondaryText.classList.add('nowPlayingBarSecondaryText');
if (textLines.length > 1) { if (textLines.length > 1) {
textLines[1].secondary = true; textLines[1].secondary = true;
if (textLines[1].text) { if (textLines[1].text) {
let text = document.createElement('a'); const text = document.createElement('a');
text.innerHTML = textLines[1].text; text.innerHTML = textLines[1].text;
secondaryText.appendChild(text); secondaryText.appendChild(text);
} }
} }
if (textLines[0].text) { if (textLines[0].text) {
let text = document.createElement('a'); const text = document.createElement('a');
text.innerHTML = textLines[0].text; text.innerHTML = textLines[0].text;
itemText.appendChild(text); itemText.appendChild(text);
} }
@ -555,10 +555,10 @@ import 'emby-ratingbutton';
if (!layoutManager.mobile) { if (!layoutManager.mobile) {
let contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu'); let contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu');
// We remove the previous event listener by replacing the item in each update event // We remove the previous event listener by replacing the item in each update event
let contextButtonClone = contextButton.cloneNode(true); const contextButtonClone = contextButton.cloneNode(true);
contextButton.parentNode.replaceChild(contextButtonClone, contextButton); contextButton.parentNode.replaceChild(contextButtonClone, contextButton);
contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu'); contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu');
let options = { const options = {
play: false, play: false,
queue: false, queue: false,
clearQueue: true, clearQueue: true,
@ -600,10 +600,10 @@ import 'emby-ratingbutton';
return; return;
} }
let shuffleMode = playbackManager.getQueueShuffleMode(); const shuffleMode = playbackManager.getQueueShuffleMode();
let context = nowPlayingBarElement; const context = nowPlayingBarElement;
const cssClass = 'buttonActive'; const cssClass = 'buttonActive';
let toggleShuffleButton = context.querySelector('.btnShuffleQueue'); const toggleShuffleButton = context.querySelector('.btnShuffleQueue');
switch (shuffleMode) { switch (shuffleMode) {
case 'Shuffle': case 'Shuffle':
toggleShuffleButton.classList.add(cssClass); toggleShuffleButton.classList.add(cssClass);

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

@ -127,7 +127,7 @@ import connectionManager from 'connectionManager';
artwork: getImageUrls(item) artwork: getImageUrls(item)
}); });
} else { } else {
let itemImageUrl = seriesImageUrl(item, { maxHeight: 3000 }) || imageUrl(item, { maxHeight: 3000 }); const itemImageUrl = seriesImageUrl(item, { maxHeight: 3000 }) || imageUrl(item, { maxHeight: 3000 });
window.NativeShell.updateMediaSession({ window.NativeShell.updateMediaSession({
action: eventName, action: eventName,
@ -244,10 +244,10 @@ import connectionManager from 'connectionManager';
/* eslint-disable-next-line compat/compat */ /* eslint-disable-next-line compat/compat */
navigator.mediaSession.setActionHandler('seekto', function (object) { navigator.mediaSession.setActionHandler('seekto', function (object) {
let item = playbackManager.getPlayerState(currentPlayer).NowPlayingItem; const item = playbackManager.getPlayerState(currentPlayer).NowPlayingItem;
// Convert to ms // Convert to ms
let duration = parseInt(item.RunTimeTicks ? (item.RunTimeTicks / 10000) : 0); const duration = parseInt(item.RunTimeTicks ? (item.RunTimeTicks / 10000) : 0);
let wantedTime = object.seekTime * 1000; const wantedTime = object.seekTime * 1000;
playbackManager.seekPercent(wantedTime / duration * 100, currentPlayer); playbackManager.seekPercent(wantedTime / duration * 100, currentPlayer);
}); });
} }

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

@ -8,7 +8,7 @@ import * as userSettings from 'userSettings';
import globalize from 'globalize'; import globalize from 'globalize';
import connectionManager from 'connectionManager'; import connectionManager from 'connectionManager';
import loading from 'loading'; import loading from 'loading';
import apphost from 'apphost'; import appHost from 'apphost';
import screenfull from 'screenfull'; import screenfull from 'screenfull';
function enableLocalPlaylistManagement(player) { function enableLocalPlaylistManagement(player) {
@ -322,7 +322,7 @@ function getAudioStreamUrl(item, transcodingProfile, directPlayContainers, maxBi
PlaySessionId: startingPlaySession, PlaySessionId: startingPlaySession,
StartTimeTicks: startPosition || 0, StartTimeTicks: startPosition || 0,
EnableRedirection: true, EnableRedirection: true,
EnableRemoteMedia: apphost.supports('remoteaudio') EnableRemoteMedia: appHost.supports('remoteaudio')
}); });
} }
@ -606,7 +606,7 @@ function supportsDirectPlay(apiClient, item, mediaSource) {
const isFolderRip = mediaSource.VideoType === 'BluRay' || mediaSource.VideoType === 'Dvd' || mediaSource.VideoType === 'HdDvd'; const isFolderRip = mediaSource.VideoType === 'BluRay' || mediaSource.VideoType === 'Dvd' || mediaSource.VideoType === 'HdDvd';
if (mediaSource.SupportsDirectPlay || isFolderRip) { if (mediaSource.SupportsDirectPlay || isFolderRip) {
if (mediaSource.IsRemote && !apphost.supports('remotevideo')) { if (mediaSource.IsRemote && !appHost.supports('remotevideo')) {
return Promise.resolve(false); return Promise.resolve(false);
} }
@ -3156,7 +3156,7 @@ class PlaybackManager {
return streamInfo ? streamInfo.playbackStartTimeTicks : null; return streamInfo ? streamInfo.playbackStartTimeTicks : null;
}; };
if (apphost.supports('remotecontrol')) { if (appHost.supports('remotecontrol')) {
import('serverNotifications').then(({ default: serverNotifications }) => { import('serverNotifications').then(({ default: serverNotifications }) => {
events.on(serverNotifications, 'ServerShuttingDown', self.setDefaultPlayerActive.bind(self)); events.on(serverNotifications, 'ServerShuttingDown', self.setDefaultPlayerActive.bind(self));
events.on(serverNotifications, 'ServerRestarting', self.setDefaultPlayerActive.bind(self)); events.on(serverNotifications, 'ServerRestarting', self.setDefaultPlayerActive.bind(self));
@ -3520,7 +3520,7 @@ class PlaybackManager {
'PlayTrailers' 'PlayTrailers'
]; ];
if (apphost.supports('fullscreenchange')) { if (appHost.supports('fullscreenchange')) {
list.push('ToggleFullscreen'); list.push('ToggleFullscreen');
} }

300
src/components/qualityOptions.js
View file

@ -1,160 +1,158 @@
define(['globalize'], function (globalize) { import globalize from 'globalize';
'use strict';
function getVideoQualityOptions(options) { export function getVideoQualityOptions(options) {
var maxStreamingBitrate = options.currentMaxBitrate; var maxStreamingBitrate = options.currentMaxBitrate;
var videoWidth = options.videoWidth; var videoWidth = options.videoWidth;
var videoHeight = options.videoHeight; var videoHeight = options.videoHeight;
// If the aspect ratio is less than 16/9 (1.77), set the width as if it were pillarboxed. // If the aspect ratio is less than 16/9 (1.77), set the width as if it were pillarboxed.
// 4:3 1440x1080 -> 1920x1080 // 4:3 1440x1080 -> 1920x1080
if (videoWidth / videoHeight < 16 / 9) { if (videoWidth / videoHeight < 16 / 9) {
videoWidth = videoHeight * (16 / 9); videoWidth = videoHeight * (16 / 9);
}
var maxAllowedWidth = videoWidth || 4096;
var qualityOptions = [];
if (maxAllowedWidth >= 3800) {
qualityOptions.push({ name: '4K - 120 Mbps', maxHeight: 2160, bitrate: 120000000 });
qualityOptions.push({ name: '4K - 100 Mbps', maxHeight: 2160, bitrate: 100000000 });
qualityOptions.push({ name: '4K - 80 Mbps', maxHeight: 2160, bitrate: 80000000 });
}
// Some 1080- videos are reported as 1912?
if (maxAllowedWidth >= 1900) {
qualityOptions.push({ name: '1080p - 60 Mbps', maxHeight: 1080, bitrate: 60000000 });
qualityOptions.push({ name: '1080p - 50 Mbps', maxHeight: 1080, bitrate: 50000000 });
qualityOptions.push({ name: '1080p - 40 Mbps', maxHeight: 1080, bitrate: 40000000 });
qualityOptions.push({ name: '1080p - 30 Mbps', maxHeight: 1080, bitrate: 30000000 });
qualityOptions.push({ name: '1080p - 25 Mbps', maxHeight: 1080, bitrate: 25000000 });
qualityOptions.push({ name: '1080p - 20 Mbps', maxHeight: 1080, bitrate: 20000000 });
qualityOptions.push({ name: '1080p - 15 Mbps', maxHeight: 1080, bitrate: 15000000 });
qualityOptions.push({ name: '1080p - 10 Mbps', maxHeight: 1080, bitrate: 10000001 });
qualityOptions.push({ name: '1080p - 8 Mbps', maxHeight: 1080, bitrate: 8000001 });
qualityOptions.push({ name: '1080p - 6 Mbps', maxHeight: 1080, bitrate: 6000001 });
qualityOptions.push({ name: '1080p - 5 Mbps', maxHeight: 1080, bitrate: 5000001 });
qualityOptions.push({ name: '1080p - 4 Mbps', maxHeight: 1080, bitrate: 4000002 });
} else if (maxAllowedWidth >= 1260) {
qualityOptions.push({ name: '720p - 10 Mbps', maxHeight: 720, bitrate: 10000000 });
qualityOptions.push({ name: '720p - 8 Mbps', maxHeight: 720, bitrate: 8000000 });
qualityOptions.push({ name: '720p - 6 Mbps', maxHeight: 720, bitrate: 6000000 });
qualityOptions.push({ name: '720p - 5 Mbps', maxHeight: 720, bitrate: 5000000 });
} else if (maxAllowedWidth >= 620) {
qualityOptions.push({ name: '480p - 4 Mbps', maxHeight: 480, bitrate: 4000001 });
qualityOptions.push({ name: '480p - 3 Mbps', maxHeight: 480, bitrate: 3000001 });
qualityOptions.push({ name: '480p - 2.5 Mbps', maxHeight: 480, bitrate: 2500000 });
qualityOptions.push({ name: '480p - 2 Mbps', maxHeight: 480, bitrate: 2000001 });
qualityOptions.push({ name: '480p - 1.5 Mbps', maxHeight: 480, bitrate: 1500001 });
}
if (maxAllowedWidth >= 1260) {
qualityOptions.push({ name: '720p - 4 Mbps', maxHeight: 720, bitrate: 4000000 });
qualityOptions.push({ name: '720p - 3 Mbps', maxHeight: 720, bitrate: 3000000 });
qualityOptions.push({ name: '720p - 2 Mbps', maxHeight: 720, bitrate: 2000000 });
// The extra 1 is because they're keyed off the bitrate value
qualityOptions.push({ name: '720p - 1.5 Mbps', maxHeight: 720, bitrate: 1500000 });
qualityOptions.push({ name: '720p - 1 Mbps', maxHeight: 720, bitrate: 1000001 });
}
qualityOptions.push({ name: '480p - 1 Mbps', maxHeight: 480, bitrate: 1000000 });
qualityOptions.push({ name: '480p - 720 kbps', maxHeight: 480, bitrate: 720000 });
qualityOptions.push({ name: '480p - 420 kbps', maxHeight: 480, bitrate: 420000 });
qualityOptions.push({ name: '360p', maxHeight: 360, bitrate: 400000 });
qualityOptions.push({ name: '240p', maxHeight: 240, bitrate: 320000 });
qualityOptions.push({ name: '144p', maxHeight: 144, bitrate: 192000 });
var autoQualityOption = {
name: globalize.translate('Auto'),
bitrate: 0,
selected: options.isAutomaticBitrateEnabled
};
if (options.enableAuto) {
qualityOptions.push(autoQualityOption);
}
if (maxStreamingBitrate) {
var selectedIndex = -1;
for (var i = 0, length = qualityOptions.length; i < length; i++) {
var option = qualityOptions[i];
if (selectedIndex === -1 && option.bitrate <= maxStreamingBitrate) {
selectedIndex = i;
}
}
if (selectedIndex === -1) {
selectedIndex = qualityOptions.length - 1;
}
var currentQualityOption = qualityOptions[selectedIndex];
if (!options.isAutomaticBitrateEnabled) {
currentQualityOption.selected = true;
} else {
autoQualityOption.autoText = currentQualityOption.name;
}
}
return qualityOptions;
} }
function getAudioQualityOptions(options) { var maxAllowedWidth = videoWidth || 4096;
var maxStreamingBitrate = options.currentMaxBitrate;
var qualityOptions = []; var qualityOptions = [];
qualityOptions.push({ name: '2 Mbps', bitrate: 2000000 }); if (maxAllowedWidth >= 3800) {
qualityOptions.push({ name: '1.5 Mbps', bitrate: 1500000 }); qualityOptions.push({ name: '4K - 120 Mbps', maxHeight: 2160, bitrate: 120000000 });
qualityOptions.push({ name: '1 Mbps', bitrate: 1000000 }); qualityOptions.push({ name: '4K - 100 Mbps', maxHeight: 2160, bitrate: 100000000 });
qualityOptions.push({ name: '320 kbps', bitrate: 320000 }); qualityOptions.push({ name: '4K - 80 Mbps', maxHeight: 2160, bitrate: 80000000 });
qualityOptions.push({ name: '256 kbps', bitrate: 256000 });
qualityOptions.push({ name: '192 kbps', bitrate: 192000 });
qualityOptions.push({ name: '128 kbps', bitrate: 128000 });
qualityOptions.push({ name: '96 kbps', bitrate: 96000 });
qualityOptions.push({ name: '64 kbps', bitrate: 64000 });
var autoQualityOption = {
name: globalize.translate('Auto'),
bitrate: 0,
selected: options.isAutomaticBitrateEnabled
};
if (options.enableAuto) {
qualityOptions.push(autoQualityOption);
}
if (maxStreamingBitrate) {
var selectedIndex = -1;
for (var i = 0, length = qualityOptions.length; i < length; i++) {
var option = qualityOptions[i];
if (selectedIndex === -1 && option.bitrate <= maxStreamingBitrate) {
selectedIndex = i;
}
}
if (selectedIndex === -1) {
selectedIndex = qualityOptions.length - 1;
}
var currentQualityOption = qualityOptions[selectedIndex];
if (!options.isAutomaticBitrateEnabled) {
currentQualityOption.selected = true;
} else {
autoQualityOption.autoText = currentQualityOption.name;
}
}
return qualityOptions;
} }
return { // Some 1080- videos are reported as 1912?
getVideoQualityOptions: getVideoQualityOptions, if (maxAllowedWidth >= 1900) {
getAudioQualityOptions: getAudioQualityOptions qualityOptions.push({ name: '1080p - 60 Mbps', maxHeight: 1080, bitrate: 60000000 });
qualityOptions.push({ name: '1080p - 50 Mbps', maxHeight: 1080, bitrate: 50000000 });
qualityOptions.push({ name: '1080p - 40 Mbps', maxHeight: 1080, bitrate: 40000000 });
qualityOptions.push({ name: '1080p - 30 Mbps', maxHeight: 1080, bitrate: 30000000 });
qualityOptions.push({ name: '1080p - 25 Mbps', maxHeight: 1080, bitrate: 25000000 });
qualityOptions.push({ name: '1080p - 20 Mbps', maxHeight: 1080, bitrate: 20000000 });
qualityOptions.push({ name: '1080p - 15 Mbps', maxHeight: 1080, bitrate: 15000000 });
qualityOptions.push({ name: '1080p - 10 Mbps', maxHeight: 1080, bitrate: 10000001 });
qualityOptions.push({ name: '1080p - 8 Mbps', maxHeight: 1080, bitrate: 8000001 });
qualityOptions.push({ name: '1080p - 6 Mbps', maxHeight: 1080, bitrate: 6000001 });
qualityOptions.push({ name: '1080p - 5 Mbps', maxHeight: 1080, bitrate: 5000001 });
qualityOptions.push({ name: '1080p - 4 Mbps', maxHeight: 1080, bitrate: 4000002 });
} else if (maxAllowedWidth >= 1260) {
qualityOptions.push({ name: '720p - 10 Mbps', maxHeight: 720, bitrate: 10000000 });
qualityOptions.push({ name: '720p - 8 Mbps', maxHeight: 720, bitrate: 8000000 });
qualityOptions.push({ name: '720p - 6 Mbps', maxHeight: 720, bitrate: 6000000 });
qualityOptions.push({ name: '720p - 5 Mbps', maxHeight: 720, bitrate: 5000000 });
} else if (maxAllowedWidth >= 620) {
qualityOptions.push({ name: '480p - 4 Mbps', maxHeight: 480, bitrate: 4000001 });
qualityOptions.push({ name: '480p - 3 Mbps', maxHeight: 480, bitrate: 3000001 });
qualityOptions.push({ name: '480p - 2.5 Mbps', maxHeight: 480, bitrate: 2500000 });
qualityOptions.push({ name: '480p - 2 Mbps', maxHeight: 480, bitrate: 2000001 });
qualityOptions.push({ name: '480p - 1.5 Mbps', maxHeight: 480, bitrate: 1500001 });
}
if (maxAllowedWidth >= 1260) {
qualityOptions.push({ name: '720p - 4 Mbps', maxHeight: 720, bitrate: 4000000 });
qualityOptions.push({ name: '720p - 3 Mbps', maxHeight: 720, bitrate: 3000000 });
qualityOptions.push({ name: '720p - 2 Mbps', maxHeight: 720, bitrate: 2000000 });
// The extra 1 is because they're keyed off the bitrate value
qualityOptions.push({ name: '720p - 1.5 Mbps', maxHeight: 720, bitrate: 1500000 });
qualityOptions.push({ name: '720p - 1 Mbps', maxHeight: 720, bitrate: 1000001 });
}
qualityOptions.push({ name: '480p - 1 Mbps', maxHeight: 480, bitrate: 1000000 });
qualityOptions.push({ name: '480p - 720 kbps', maxHeight: 480, bitrate: 720000 });
qualityOptions.push({ name: '480p - 420 kbps', maxHeight: 480, bitrate: 420000 });
qualityOptions.push({ name: '360p', maxHeight: 360, bitrate: 400000 });
qualityOptions.push({ name: '240p', maxHeight: 240, bitrate: 320000 });
qualityOptions.push({ name: '144p', maxHeight: 144, bitrate: 192000 });
var autoQualityOption = {
name: globalize.translate('Auto'),
bitrate: 0,
selected: options.isAutomaticBitrateEnabled
}; };
});
if (options.enableAuto) {
qualityOptions.push(autoQualityOption);
}
if (maxStreamingBitrate) {
var selectedIndex = -1;
for (var i = 0, length = qualityOptions.length; i < length; i++) {
var option = qualityOptions[i];
if (selectedIndex === -1 && option.bitrate <= maxStreamingBitrate) {
selectedIndex = i;
}
}
if (selectedIndex === -1) {
selectedIndex = qualityOptions.length - 1;
}
var currentQualityOption = qualityOptions[selectedIndex];
if (!options.isAutomaticBitrateEnabled) {
currentQualityOption.selected = true;
} else {
autoQualityOption.autoText = currentQualityOption.name;
}
}
return qualityOptions;
}
export function getAudioQualityOptions(options) {
var maxStreamingBitrate = options.currentMaxBitrate;
var qualityOptions = [];
qualityOptions.push({ name: '2 Mbps', bitrate: 2000000 });
qualityOptions.push({ name: '1.5 Mbps', bitrate: 1500000 });
qualityOptions.push({ name: '1 Mbps', bitrate: 1000000 });
qualityOptions.push({ name: '320 kbps', bitrate: 320000 });
qualityOptions.push({ name: '256 kbps', bitrate: 256000 });
qualityOptions.push({ name: '192 kbps', bitrate: 192000 });
qualityOptions.push({ name: '128 kbps', bitrate: 128000 });
qualityOptions.push({ name: '96 kbps', bitrate: 96000 });
qualityOptions.push({ name: '64 kbps', bitrate: 64000 });
var autoQualityOption = {
name: globalize.translate('Auto'),
bitrate: 0,
selected: options.isAutomaticBitrateEnabled
};
if (options.enableAuto) {
qualityOptions.push(autoQualityOption);
}
if (maxStreamingBitrate) {
var selectedIndex = -1;
for (var i = 0, length = qualityOptions.length; i < length; i++) {
var option = qualityOptions[i];
if (selectedIndex === -1 && option.bitrate <= maxStreamingBitrate) {
selectedIndex = i;
}
}
if (selectedIndex === -1) {
selectedIndex = qualityOptions.length - 1;
}
var currentQualityOption = qualityOptions[selectedIndex];
if (!options.isAutomaticBitrateEnabled) {
currentQualityOption.selected = true;
} else {
autoQualityOption.autoText = currentQualityOption.name;
}
}
return qualityOptions;
}
export default {
getVideoQualityOptions,
getAudioQualityOptions
};

2
src/components/scrollManager.js
View file

@ -251,7 +251,7 @@ import layoutManager from 'layoutManager';
* @return {ScrollerData} Scroller data. * @return {ScrollerData} Scroller data.
*/ */
function getScrollerData(scroller, vertical) { function getScrollerData(scroller, vertical) {
let data = {}; const data = {};
if (!vertical) { if (!vertical) {
data.scrollPos = scroller.scrollLeft; data.scrollPos = scroller.scrollLeft;

6
src/components/subtitlesettings/subtitleappearancehelper.js
View file

@ -4,7 +4,7 @@
*/ */
function getTextStyles(settings, preview) { function getTextStyles(settings, preview) {
let list = []; const list = [];
switch (settings.textSize || '') { switch (settings.textSize || '') {
case 'smaller': case 'smaller':
@ -130,14 +130,14 @@ export function getStyles(settings, preview) {
function applyStyleList(styles, elem) { function applyStyleList(styles, elem) {
for (let i = 0, length = styles.length; i < length; i++) { for (let i = 0, length = styles.length; i < length; i++) {
let style = styles[i]; const style = styles[i];
elem.style[style.name] = style.value; elem.style[style.name] = style.value;
} }
} }
export function applyStyles(elements, appearanceSettings) { export function applyStyles(elements, appearanceSettings) {
let styles = getStyles(appearanceSettings, !!elements.preview); const styles = getStyles(appearanceSettings, !!elements.preview);
if (elements.text) { if (elements.text) {
applyStyleList(styles.text, elements.text); applyStyleList(styles.text, elements.text);

34
src/components/subtitlesettings/subtitlesettings.js
View file

@ -23,7 +23,7 @@ import 'css!./subtitlesettings';
*/ */
function getSubtitleAppearanceObject(context) { function getSubtitleAppearanceObject(context) {
let appearanceSettings = {}; const appearanceSettings = {};
appearanceSettings.textSize = context.querySelector('#selectTextSize').value; appearanceSettings.textSize = context.querySelector('#selectTextSize').value;
appearanceSettings.dropShadow = context.querySelector('#selectDropShadow').value; appearanceSettings.dropShadow = context.querySelector('#selectDropShadow').value;
@ -41,7 +41,7 @@ function loadForm(context, user, userSettings, appearanceSettings, apiClient) {
context.querySelector('.fldBurnIn').classList.remove('hide'); context.querySelector('.fldBurnIn').classList.remove('hide');
} }
let selectSubtitleLanguage = context.querySelector('#selectSubtitleLanguage'); const selectSubtitleLanguage = context.querySelector('#selectSubtitleLanguage');
settingsHelper.populateLanguages(selectSubtitleLanguage, allCultures); settingsHelper.populateLanguages(selectSubtitleLanguage, allCultures);
@ -101,9 +101,9 @@ function save(instance, context, userId, userSettings, apiClient, enableSaveConf
} }
function onSubtitleModeChange(e) { function onSubtitleModeChange(e) {
let view = dom.parentWithClass(e.target, 'subtitlesettings'); const view = dom.parentWithClass(e.target, 'subtitlesettings');
let subtitlesHelp = view.querySelectorAll('.subtitlesHelp'); const subtitlesHelp = view.querySelectorAll('.subtitlesHelp');
for (let i = 0, length = subtitlesHelp.length; i < length; i++) { for (let i = 0, length = subtitlesHelp.length; i < length; i++) {
subtitlesHelp[i].classList.add('hide'); subtitlesHelp[i].classList.add('hide');
} }
@ -111,11 +111,11 @@ function onSubtitleModeChange(e) {
} }
function onAppearanceFieldChange(e) { function onAppearanceFieldChange(e) {
let view = dom.parentWithClass(e.target, 'subtitlesettings'); const view = dom.parentWithClass(e.target, 'subtitlesettings');
let appearanceSettings = getSubtitleAppearanceObject(view); const appearanceSettings = getSubtitleAppearanceObject(view);
let elements = { const elements = {
window: view.querySelector('.subtitleappearance-preview-window'), window: view.querySelector('.subtitleappearance-preview-window'),
text: view.querySelector('.subtitleappearance-preview-text'), text: view.querySelector('.subtitleappearance-preview-text'),
preview: true preview: true
@ -226,20 +226,20 @@ export class SubtitleSettings {
} }
loadData() { loadData() {
let self = this; const self = this;
let context = self.options.element; const context = self.options.element;
loading.show(); loading.show();
let userId = self.options.userId; const userId = self.options.userId;
let apiClient = connectionManager.getApiClient(self.options.serverId); const apiClient = connectionManager.getApiClient(self.options.serverId);
let userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
apiClient.getUser(userId).then(function (user) { apiClient.getUser(userId).then(function (user) {
userSettings.setUserInfo(userId, apiClient).then(function () { userSettings.setUserInfo(userId, apiClient).then(function () {
self.dataLoaded = true; self.dataLoaded = true;
let appearanceSettings = userSettings.getSubtitleAppearanceSettings(self.options.appearanceKey); const appearanceSettings = userSettings.getSubtitleAppearanceSettings(self.options.appearanceKey);
loadForm(context, user, userSettings, appearanceSettings, apiClient); loadForm(context, user, userSettings, appearanceSettings, apiClient);
}); });
@ -256,12 +256,12 @@ export class SubtitleSettings {
onSubmit(e) { onSubmit(e) {
const self = this; const self = this;
let apiClient = connectionManager.getApiClient(self.options.serverId); const apiClient = connectionManager.getApiClient(self.options.serverId);
let userId = self.options.userId; const userId = self.options.userId;
let userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
userSettings.setUserInfo(userId, apiClient).then(function () { userSettings.setUserInfo(userId, apiClient).then(function () {
let enableSaveConfirmation = self.options.enableSaveConfirmation; const enableSaveConfirmation = self.options.enableSaveConfirmation;
save(self, self.options.element, userId, userSettings, apiClient, enableSaveConfirmation); save(self, self.options.element, userId, userSettings, apiClient, enableSaveConfirmation);
}); });

2
src/controllers/dashboard/dashboard.js
View file

@ -24,7 +24,7 @@ import 'emby-itemscontainer';
function showPlaybackInfo(btn, session) { function showPlaybackInfo(btn, session) {
import('alert').then(({default: alert}) => { import('alert').then(({default: alert}) => {
let title; let title;
let text = []; const text = [];
const displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session); const displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session);
if (displayPlayMethod === 'DirectStream') { if (displayPlayMethod === 'DirectStream') {

2
src/controllers/dashboard/devices/devices.js
View file

@ -38,7 +38,7 @@ import 'cardStyle';
} }
function showDeviceMenu(view, btn, deviceId) { function showDeviceMenu(view, btn, deviceId) {
let menuItems = []; const menuItems = [];
if (canEdit) { if (canEdit) {
menuItems.push({ menuItems.push({

6
src/controllers/dashboard/dlna/profile.js
View file

@ -315,7 +315,7 @@ import 'listViewStyle';
let currentType; let currentType;
for (let i = 0, length = profiles.length; i < length; i++) { for (let i = 0, length = profiles.length; i < length; i++) {
let profile = profiles[i]; const profile = profiles[i];
if (profile.Type !== currentType) { if (profile.Type !== currentType) {
html += '<li data-role="list-divider">' + profile.Type + '</li>'; html += '<li data-role="list-divider">' + profile.Type + '</li>';
@ -401,7 +401,7 @@ import 'listViewStyle';
let currentType; let currentType;
for (let i = 0, length = profiles.length; i < length; i++) { for (let i = 0, length = profiles.length; i < length; i++) {
let profile = profiles[i]; const profile = profiles[i];
if (profile.Type !== currentType) { if (profile.Type !== currentType) {
html += '<li data-role="list-divider">' + profile.Type + '</li>'; html += '<li data-role="list-divider">' + profile.Type + '</li>';
@ -472,7 +472,7 @@ import 'listViewStyle';
let currentType; let currentType;
for (let i = 0, length = profiles.length; i < length; i++) { for (let i = 0, length = profiles.length; i < length; i++) {
let profile = profiles[i]; const profile = profiles[i];
const type = profile.Type.replace('VideoAudio', 'Video Audio'); const type = profile.Type.replace('VideoAudio', 'Video Audio');
if (type !== currentType) { if (type !== currentType) {

2
src/controllers/dashboard/dlna/profiles.js
View file

@ -36,7 +36,7 @@ import 'emby-button';
} }
for (let i = 0, length = profiles.length; i < length; i++) { for (let i = 0, length = profiles.length; i < length; i++) {
let profile = profiles[i]; const profile = profiles[i];
html += '<div class="listItem listItem-border">'; html += '<div class="listItem listItem-border">';
html += '<span class="listItemIcon material-icons live_tv"></span>'; html += '<span class="listItemIcon material-icons live_tv"></span>';
html += '<div class="listItemBody two-line">'; html += '<div class="listItemBody two-line">';

2
src/controllers/dashboard/plugins/add/index.js
View file

@ -8,7 +8,7 @@ function populateHistory(packageInfo, page) {
const length = Math.min(packageInfo.versions.length, 10); const length = Math.min(packageInfo.versions.length, 10);
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
let version = packageInfo.versions[i]; const version = packageInfo.versions[i];
html += '<h2 style="margin:.5em 0;">' + version.version + '</h2>'; html += '<h2 style="margin:.5em 0;">' + version.version + '</h2>';
html += '<div style="margin-bottom:1.5em;">' + version.changelog + '</div>'; html += '<div style="margin-bottom:1.5em;">' + version.changelog + '</div>';
} }

2
src/controllers/dashboard/plugins/repositories/index.js
View file

@ -105,7 +105,7 @@ export default function(view, params) {
}); });
view.querySelector('.btnNewRepository').addEventListener('click', () => { view.querySelector('.btnNewRepository').addEventListener('click', () => {
let dialog = dialogHelper.createDialog({ const dialog = dialogHelper.createDialog({
scrollY: false, scrollY: false,
size: 'large', size: 'large',
modal: false, modal: false,

6
src/controllers/dashboard/scheduledtasks/scheduledtask.js
View file

@ -33,7 +33,7 @@ import 'emby-select';
const ScheduledTaskPage = { const ScheduledTaskPage = {
refreshScheduledTask: function (view) { refreshScheduledTask: function (view) {
loading.show(); loading.show();
let id = getParameterByName('id'); const id = getParameterByName('id');
ApiClient.getScheduledTask(id).then(function (task) { ApiClient.getScheduledTask(id).then(function (task) {
ScheduledTaskPage.loadScheduledTask(view, task); ScheduledTaskPage.loadScheduledTask(view, task);
}); });
@ -143,7 +143,7 @@ import 'emby-select';
}, },
deleteTrigger: function (view, index) { deleteTrigger: function (view, index) {
loading.show(); loading.show();
let id = getParameterByName('id'); const id = getParameterByName('id');
ApiClient.getScheduledTask(id).then(function (task) { ApiClient.getScheduledTask(id).then(function (task) {
task.Triggers.remove(index); task.Triggers.remove(index);
ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).then(function () { ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).then(function () {
@ -211,7 +211,7 @@ import 'emby-select';
export default function (view, params) { export default function (view, params) {
function onSubmit(e) { function onSubmit(e) {
loading.show(); loading.show();
let id = getParameterByName('id'); const id = getParameterByName('id');
ApiClient.getScheduledTask(id).then(function (task) { ApiClient.getScheduledTask(id).then(function (task) {
task.Triggers.push(ScheduledTaskPage.getTriggerToAdd(view)); task.Triggers.push(ScheduledTaskPage.getTriggerToAdd(view));
ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).then(function () { ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).then(function () {

6
src/controllers/dashboard/scheduledtasks/scheduledtasks.js
View file

@ -103,7 +103,7 @@ import 'emby-button';
} }
function setTaskButtonIcon(button, icon) { function setTaskButtonIcon(button, icon) {
let inner = button.querySelector('.material-icons'); const inner = button.querySelector('.material-icons');
inner.classList.remove('stop', 'play_arrow'); inner.classList.remove('stop', 'play_arrow');
inner.classList.add(icon); inner.classList.add(icon);
} }
@ -160,7 +160,7 @@ import 'emby-button';
$('.divScheduledTasks', view).on('click', '.btnStartTask', function() { $('.divScheduledTasks', view).on('click', '.btnStartTask', function() {
const button = this; const button = this;
let id = button.getAttribute('data-taskid'); const id = button.getAttribute('data-taskid');
ApiClient.startScheduledTask(id).then(function() { ApiClient.startScheduledTask(id).then(function() {
updateTaskButton(button, 'Running'); updateTaskButton(button, 'Running');
reloadList(view); reloadList(view);
@ -169,7 +169,7 @@ import 'emby-button';
$('.divScheduledTasks', view).on('click', '.btnStopTask', function() { $('.divScheduledTasks', view).on('click', '.btnStopTask', function() {
const button = this; const button = this;
let id = button.getAttribute('data-taskid'); const id = button.getAttribute('data-taskid');
ApiClient.stopScheduledTask(id).then(function() { ApiClient.stopScheduledTask(id).then(function() {
updateTaskButton(button, ''); updateTaskButton(button, '');
reloadList(view); reloadList(view);

2
src/controllers/itemDetails/index.js
View file

@ -374,7 +374,7 @@ import 'emby-select';
} }
function getArtistLinksHtml(artists, serverId, context) { function getArtistLinksHtml(artists, serverId, context) {
let html = []; const html = [];
for (const artist of artists) { for (const artist of artists) {
const href = appRouter.getRouteUrl(artist, { const href = appRouter.getRouteUrl(artist, {

8
src/controllers/livetvstatus.js
View file

@ -15,12 +15,10 @@ import 'emby-button';
const enableFocusTransform = !browser.slow && !browser.edge; const enableFocusTransform = !browser.slow && !browser.edge;
function getDeviceHtml(device) { function getDeviceHtml(device) {
let padderClass; const padderClass = 'cardPadder-backdrop';
let cssClass = 'card scalableCard backdropCard backdropCard-scalable';
const cardBoxCssClass = 'cardBox visualCardBox';
let html = ''; 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

1
src/controllers/music/musicrecommended.js
View file

@ -104,7 +104,6 @@ import 'flexStyles';
} }
var itemsContainer = elem.querySelector('.itemsContainer'); var itemsContainer = elem.querySelector('.itemsContainer');
itemsContainer.innerHTML = cardBuilder.getCardsHtml({ itemsContainer.innerHTML = cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
showUnplayedIndicator: false, showUnplayedIndicator: false,

6
src/controllers/playback/video/index.js
View file

@ -172,9 +172,7 @@ import 'css!assets/css/videoosd';
} }
setTitle(displayItem, parentName); setTitle(displayItem, parentName);
let titleElement; const titleElement = view.querySelector('.osdTitle');
const osdTitle = view.querySelector('.osdTitle');
titleElement = osdTitle;
let displayName = itemHelper.getDisplayName(displayItem, { let displayName = itemHelper.getDisplayName(displayItem, {
includeParentInfo: displayItem.Type !== 'Program', includeParentInfo: displayItem.Type !== 'Program',
includeIndexNumber: displayItem.Type !== 'Program' includeIndexNumber: displayItem.Type !== 'Program'
@ -1619,7 +1617,7 @@ import 'css!assets/css/videoosd';
const item = currentItem; const item = currentItem;
if (item && item.Chapters && item.Chapters.length && item.Chapters[0].ImageTag) { if (item && item.Chapters && item.Chapters.length && item.Chapters[0].ImageTag) {
let html = getChapterBubbleHtml(connectionManager.getApiClient(item.ServerId), item, item.Chapters, ticks); const html = getChapterBubbleHtml(connectionManager.getApiClient(item.ServerId), item, item.Chapters, ticks);
if (html) { if (html) {
return html; return html;

4
src/elements/emby-checkbox/emby-checkbox.js
View file

@ -5,7 +5,7 @@ import 'webcomponents';
/* eslint-disable indent */ /* eslint-disable indent */
let EmbyCheckboxPrototype = Object.create(HTMLInputElement.prototype); const EmbyCheckboxPrototype = Object.create(HTMLInputElement.prototype);
function onKeyDown(e) { function onKeyDown(e) {
// Don't submit form on enter // Don't submit form on enter
@ -26,7 +26,7 @@ import 'webcomponents';
const enableRefreshHack = browser.tizen || browser.orsay || browser.operaTv || browser.web0s ? true : false; const enableRefreshHack = browser.tizen || browser.orsay || browser.operaTv || browser.web0s ? true : false;
function forceRefresh(loading) { function forceRefresh(loading) {
let elem = this.parentNode; const elem = this.parentNode;
elem.style.webkitAnimationName = 'repaintChrome'; elem.style.webkitAnimationName = 'repaintChrome';
elem.style.webkitAnimationDelay = (loading === true ? '500ms' : ''); elem.style.webkitAnimationDelay = (loading === true ? '500ms' : '');

2
src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
View file

@ -40,7 +40,7 @@ import 'webcomponents';
} }
} }
let EmbyItemRefreshIndicatorPrototype = Object.create(EmbyProgressRing); const EmbyItemRefreshIndicatorPrototype = Object.create(EmbyProgressRing);
EmbyItemRefreshIndicatorPrototype.createdCallback = function () { EmbyItemRefreshIndicatorPrototype.createdCallback = function () {
// base method // base method

10
src/elements/emby-itemscontainer/emby-itemscontainer.js
View file

@ -18,7 +18,7 @@ import 'webcomponents';
function onClick(e) { function onClick(e) {
const itemsContainer = this; const itemsContainer = this;
let multiSelect = itemsContainer.multiSelect; const multiSelect = itemsContainer.multiSelect;
if (multiSelect) { if (multiSelect) {
if (multiSelect.onContainerClick.call(itemsContainer, e) === false) { if (multiSelect.onContainerClick.call(itemsContainer, e) === false) {
@ -164,7 +164,7 @@ import 'webcomponents';
} }
function getEventsToMonitor(itemsContainer) { function getEventsToMonitor(itemsContainer) {
let monitor = itemsContainer.getAttribute('data-monitor'); const monitor = itemsContainer.getAttribute('data-monitor');
if (monitor) { if (monitor) {
return monitor.split(','); return monitor.split(',');
} }
@ -356,7 +356,7 @@ import 'webcomponents';
ItemsContainerPrototype.resume = function (options) { ItemsContainerPrototype.resume = function (options) {
this.paused = false; this.paused = false;
let refreshIntervalEndTime = this.refreshIntervalEndTime; const refreshIntervalEndTime = this.refreshIntervalEndTime;
if (refreshIntervalEndTime) { if (refreshIntervalEndTime) {
const remainingMs = refreshIntervalEndTime - new Date().getTime(); const remainingMs = refreshIntervalEndTime - new Date().getTime();
if (remainingMs > 0 && !this.needsRefresh) { if (remainingMs > 0 && !this.needsRefresh) {
@ -395,7 +395,7 @@ import 'webcomponents';
return; return;
} }
let timeout = this.refreshTimeout; const timeout = this.refreshTimeout;
if (timeout) { if (timeout) {
clearTimeout(timeout); clearTimeout(timeout);
} }
@ -434,7 +434,7 @@ import 'webcomponents';
function onDataFetched(result) { function onDataFetched(result) {
const items = result.Items || result; const items = result.Items || result;
let parentContainer = this.parentContainer; const parentContainer = this.parentContainer;
if (parentContainer) { if (parentContainer) {
if (items.length) { if (items.length) {
parentContainer.classList.remove('hide'); parentContainer.classList.remove('hide');

2
src/elements/emby-playstatebutton/emby-playstatebutton.js
View file

@ -75,7 +75,7 @@ import EmbyButtonPrototype from 'emby-button';
button.title = globalize.translate('Played'); button.title = globalize.translate('Played');
} }
let text = button.querySelector('.button-text'); const text = button.querySelector('.button-text');
if (text) { if (text) {
text.innerHTML = button.title; text.innerHTML = button.title;
} }

2
src/elements/emby-progressbar/emby-progressbar.js
View file

@ -1,6 +1,6 @@
/* eslint-disable indent */ /* eslint-disable indent */
let ProgressBarPrototype = Object.create(HTMLDivElement.prototype); const ProgressBarPrototype = Object.create(HTMLDivElement.prototype);
function onAutoTimeProgress() { function onAutoTimeProgress() {
const start = parseInt(this.getAttribute('data-starttime')); const start = parseInt(this.getAttribute('data-starttime'));

4
src/elements/emby-progressring/emby-progressring.js
View file

@ -3,7 +3,7 @@ import 'webcomponents';
/* eslint-disable indent */ /* eslint-disable indent */
let EmbyProgressRing = Object.create(HTMLDivElement.prototype); const EmbyProgressRing = Object.create(HTMLDivElement.prototype);
EmbyProgressRing.createdCallback = function () { EmbyProgressRing.createdCallback = function () {
this.classList.add('progressring'); this.classList.add('progressring');
@ -79,7 +79,7 @@ import 'webcomponents';
}; };
EmbyProgressRing.detachedCallback = function () { EmbyProgressRing.detachedCallback = function () {
let observer = this.observer; const observer = this.observer;
if (observer) { if (observer) {
// later, you can stop observing // later, you can stop observing

6
src/elements/emby-radio/emby-radio.js
View file

@ -4,7 +4,7 @@ import 'webcomponents';
/* eslint-disable indent */ /* eslint-disable indent */
let EmbyRadioPrototype = Object.create(HTMLInputElement.prototype); const EmbyRadioPrototype = Object.create(HTMLInputElement.prototype);
function onKeyDown(e) { function onKeyDown(e) {
// Don't submit form on enter // Don't submit form on enter
@ -35,7 +35,7 @@ import 'webcomponents';
this.classList.add('mdl-radio__button'); this.classList.add('mdl-radio__button');
let labelElement = this.parentNode; const labelElement = this.parentNode;
labelElement.classList.add('mdl-radio'); labelElement.classList.add('mdl-radio');
labelElement.classList.add('mdl-js-radio'); labelElement.classList.add('mdl-js-radio');
labelElement.classList.add('mdl-js-ripple-effect'); labelElement.classList.add('mdl-js-ripple-effect');
@ -43,7 +43,7 @@ import 'webcomponents';
labelElement.classList.add('show-focus'); labelElement.classList.add('show-focus');
} }
let labelTextElement = labelElement.querySelector('span'); const labelTextElement = labelElement.querySelector('span');
labelTextElement.classList.add('radioButtonLabel'); labelTextElement.classList.add('radioButtonLabel');
labelTextElement.classList.add('mdl-radio__label'); labelTextElement.classList.add('mdl-radio__label');

4
src/elements/emby-scrollbuttons/emby-scrollbuttons.js
View file

@ -118,7 +118,7 @@ const EmbyScrollButtonsPrototype = Object.create(HTMLDivElement.prototype);
} }
function onScrollButtonClick(e) { function onScrollButtonClick(e) {
let scroller = this.parentNode.nextSibling; const scroller = this.parentNode.nextSibling;
const direction = this.getAttribute('data-direction'); const direction = this.getAttribute('data-direction');
const scrollSize = getScrollSize(scroller); const scrollSize = getScrollSize(scroller);
@ -161,7 +161,7 @@ const EmbyScrollButtonsPrototype = Object.create(HTMLDivElement.prototype);
const parent = this.scroller; const parent = this.scroller;
this.scroller = null; this.scroller = null;
let scrollHandler = this.scrollHandler; const scrollHandler = this.scrollHandler;
if (parent && scrollHandler) { if (parent && scrollHandler) {
parent.removeScrollEventListener(scrollHandler, { parent.removeScrollEventListener(scrollHandler, {
capture: false, capture: false,

2
src/elements/emby-scroller/emby-scroller.js
View file

@ -9,7 +9,7 @@ import 'css!./emby-scroller';
/* eslint-disable indent */ /* eslint-disable indent */
let ScrollerPrototype = Object.create(HTMLDivElement.prototype); const ScrollerPrototype = Object.create(HTMLDivElement.prototype);
ScrollerPrototype.createdCallback = function () { ScrollerPrototype.createdCallback = function () {
this.classList.add('emby-scroller'); this.classList.add('emby-scroller');

4
src/elements/emby-slider/emby-slider.js
View file

@ -8,7 +8,7 @@ import 'emby-input';
/* eslint-disable indent */ /* eslint-disable indent */
let EmbySliderPrototype = Object.create(HTMLInputElement.prototype); const EmbySliderPrototype = Object.create(HTMLInputElement.prototype);
let supportsValueSetOverride = false; let supportsValueSetOverride = false;
@ -94,7 +94,7 @@ import 'emby-input';
// Keep only one per slider frame request // Keep only one per slider frame request
cancelAnimationFrame(range.updateValuesFrame); cancelAnimationFrame(range.updateValuesFrame);
range.updateValuesFrame = requestAnimationFrame(function () { range.updateValuesFrame = requestAnimationFrame(function () {
let backgroundLower = range.backgroundLower; const backgroundLower = range.backgroundLower;
if (backgroundLower) { if (backgroundLower) {
let fraction = (value - range.min) / (range.max - range.min); let fraction = (value - range.min) / (range.max - range.min);

8
src/elements/emby-tabs/emby-tabs.js
View file

@ -8,7 +8,7 @@ import 'scrollStyles';
/* eslint-disable indent */ /* eslint-disable indent */
let EmbyTabs = Object.create(HTMLDivElement.prototype); const EmbyTabs = Object.create(HTMLDivElement.prototype);
const buttonClass = 'emby-tab-button'; const buttonClass = 'emby-tab-button';
const activeButtonClass = buttonClass + '-active'; const activeButtonClass = buttonClass + '-active';
@ -21,7 +21,7 @@ import 'scrollStyles';
} }
function removeActivePanelClass(tabs, index) { function removeActivePanelClass(tabs, index) {
let tabPanel = getTabPanel(tabs, index); const tabPanel = getTabPanel(tabs, index);
if (tabPanel) { if (tabPanel) {
tabPanel.classList.remove('is-active'); tabPanel.classList.remove('is-active');
} }
@ -52,7 +52,7 @@ import 'scrollStyles';
removeActivePanelClass(tabs, previousIndex); removeActivePanelClass(tabs, previousIndex);
} }
let newPanel = getTabPanel(tabs, index); const newPanel = getTabPanel(tabs, index);
if (newPanel) { if (newPanel) {
// animate new panel ? // animate new panel ?
@ -225,7 +225,7 @@ import 'scrollStyles';
} }
})); }));
let currentTabButton = tabButtons[current]; const currentTabButton = tabButtons[current];
setActiveTabButton(tabs, tabButtons[selected], currentTabButton, false); setActiveTabButton(tabs, tabButtons[selected], currentTabButton, false);
if (current !== selected && currentTabButton) { if (current !== selected && currentTabButton) {

41
src/plugins/bookPlayer/plugin.js
View file

@ -27,16 +27,16 @@ export class BookPlayer {
this._loaded = false; this._loaded = false;
loading.show(); loading.show();
let elem = this.createMediaElement(); const elem = this.createMediaElement();
return this.setCurrentSrc(elem, options); return this.setCurrentSrc(elem, options);
} }
stop() { stop() {
this.unbindEvents(); this.unbindEvents();
let elem = this._mediaElement; const elem = this._mediaElement;
let tocElement = this._tocElement; const tocElement = this._tocElement;
let rendition = this._rendition; const rendition = this._rendition;
if (elem) { if (elem) {
dialogHelper.close(elem); dialogHelper.close(elem);
@ -93,11 +93,11 @@ export class BookPlayer {
} }
onWindowKeyUp(e) { onWindowKeyUp(e) {
let key = keyboardnavigation.getKeyName(e); const key = keyboardnavigation.getKeyName(e);
// TODO: depending on the event this can be the document or the rendition itself // TODO: depending on the event this can be the document or the rendition itself
let rendition = this._rendition || this; const rendition = this._rendition || this;
let book = rendition.book; const book = rendition.book;
if (this._loaded === false) return; if (this._loaded === false) return;
switch (key) { switch (key) {
@ -125,8 +125,8 @@ export class BookPlayer {
onTouchStart(e) { onTouchStart(e) {
// TODO: depending on the event this can be the document or the rendition itself // TODO: depending on the event this can be the document or the rendition itself
let rendition = this._rendition || this; const rendition = this._rendition || this;
let book = rendition.book; const book = rendition.book;
// check that the event is from the book or the document // check that the event is from the book or the document
if (!book || this._loaded === false) return; if (!book || this._loaded === false) return;
@ -134,7 +134,8 @@ export class BookPlayer {
// epubjs stores pages off the screen or something for preloading // epubjs stores pages off the screen or something for preloading
// get the modulus of the touch event to account for the increased width // get the modulus of the touch event to account for the increased width
if (!e.touches || e.touches.length === 0) return; if (!e.touches || e.touches.length === 0) return;
let touch = e.touches[0].clientX % dom.getWindowSize().innerWidth;
const touch = e.touches[0].clientX % dom.getWindowSize().innerWidth;
if (touch < dom.getWindowSize().innerWidth / 2) { if (touch < dom.getWindowSize().innerWidth / 2) {
book.package.metadata.direction === 'rtl' ? rendition.next() : rendition.prev(); book.package.metadata.direction === 'rtl' ? rendition.next() : rendition.prev();
} else { } else {
@ -147,7 +148,7 @@ export class BookPlayer {
} }
bindMediaElementEvents() { bindMediaElementEvents() {
let elem = this._mediaElement; const elem = this._mediaElement;
elem.addEventListener('close', this.onDialogClosed, {once: true}); elem.addEventListener('close', this.onDialogClosed, {once: true});
elem.querySelector('.btnBookplayerExit').addEventListener('click', this.onDialogClosed, {once: true}); elem.querySelector('.btnBookplayerExit').addEventListener('click', this.onDialogClosed, {once: true});
@ -166,7 +167,7 @@ export class BookPlayer {
} }
unbindMediaElementEvents() { unbindMediaElementEvents() {
let elem = this._mediaElement; const elem = this._mediaElement;
elem.removeEventListener('close', this.onDialogClosed); elem.removeEventListener('close', this.onDialogClosed);
elem.querySelector('.btnBookplayerExit').removeEventListener('click', this.onDialogClosed); elem.querySelector('.btnBookplayerExit').removeEventListener('click', this.onDialogClosed);
@ -231,7 +232,7 @@ export class BookPlayer {
} }
setCurrentSrc(elem, options) { setCurrentSrc(elem, options) {
let item = options.items[0]; const item = options.items[0];
this._currentItem = item; this._currentItem = item;
this.streamInfo = { this.streamInfo = {
started: true, started: true,
@ -241,25 +242,25 @@ export class BookPlayer {
} }
}; };
let serverId = item.ServerId; const serverId = item.ServerId;
let apiClient = connectionManager.getApiClient(serverId); const apiClient = connectionManager.getApiClient(serverId);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
import('epubjs').then(({default: epubjs}) => { import('epubjs').then(({default: epubjs}) => {
let downloadHref = apiClient.getItemDownloadUrl(item.Id); const downloadHref = apiClient.getItemDownloadUrl(item.Id);
let book = epubjs(downloadHref, {openAs: 'epub'}); const book = epubjs(downloadHref, {openAs: 'epub'});
let rendition = book.renderTo(elem, {width: '100%', height: '97%'}); const rendition = book.renderTo(elem, {width: '100%', height: '97%'});
this._currentSrc = downloadHref; this._currentSrc = downloadHref;
this._rendition = rendition; this._rendition = rendition;
let cancellationToken = { const cancellationToken = {
shouldCancel: false shouldCancel: false
}; };
this._cancellationToken = cancellationToken; this._cancellationToken = cancellationToken;
return rendition.display().then(() => { return rendition.display().then(() => {
let epubElem = document.querySelector('.epub-container'); const epubElem = document.querySelector('.epub-container');
epubElem.style.display = 'none'; epubElem.style.display = 'none';
this.bindEvents(); this.bindEvents();

18
src/plugins/bookPlayer/tableOfContents.js
View file

@ -11,7 +11,7 @@ export default class TableOfContents {
} }
destroy() { destroy() {
let elem = this._elem; const elem = this._elem;
if (elem) { if (elem) {
this.unbindEvents(); this.unbindEvents();
dialogHelper.close(elem); dialogHelper.close(elem);
@ -21,14 +21,14 @@ export default class TableOfContents {
} }
bindEvents() { bindEvents() {
let elem = this._elem; const elem = this._elem;
elem.addEventListener('close', this.onDialogClosed, {once: true}); elem.addEventListener('close', this.onDialogClosed, {once: true});
elem.querySelector('.btnBookplayerTocClose').addEventListener('click', this.onDialogClosed, {once: true}); elem.querySelector('.btnBookplayerTocClose').addEventListener('click', this.onDialogClosed, {once: true});
} }
unbindEvents() { unbindEvents() {
let elem = this._elem; const elem = this._elem;
elem.removeEventListener('close', this.onDialogClosed); elem.removeEventListener('close', this.onDialogClosed);
elem.querySelector('.btnBookplayerTocClose').removeEventListener('click', this.onDialogClosed); elem.querySelector('.btnBookplayerTocClose').removeEventListener('click', this.onDialogClosed);
@ -39,10 +39,10 @@ export default class TableOfContents {
} }
replaceLinks(contents, f) { replaceLinks(contents, f) {
let links = contents.querySelectorAll('a[href]'); const links = contents.querySelectorAll('a[href]');
links.forEach((link) => { links.forEach((link) => {
let href = link.getAttribute('href'); const href = link.getAttribute('href');
link.onclick = () => { link.onclick = () => {
f(href); f(href);
@ -52,9 +52,9 @@ export default class TableOfContents {
} }
createMediaElement() { createMediaElement() {
let rendition = this._rendition; const rendition = this._rendition;
let elem = dialogHelper.createDialog({ const elem = dialogHelper.createDialog({
size: 'small', size: 'small',
autoFocus: false, autoFocus: false,
removeOnClose: true removeOnClose: true
@ -69,7 +69,7 @@ export default class TableOfContents {
rendition.book.navigation.forEach((chapter) => { rendition.book.navigation.forEach((chapter) => {
tocHtml += '<li>'; tocHtml += '<li>';
// Remove '../' from href // Remove '../' from href
let link = chapter.href.startsWith('../') ? chapter.href.substr(3) : chapter.href; const link = chapter.href.startsWith('../') ? chapter.href.substr(3) : chapter.href;
tocHtml += `<a href="${rendition.book.path.directory + link}">${chapter.label}</a>`; tocHtml += `<a href="${rendition.book.path.directory + link}">${chapter.label}</a>`;
tocHtml += '</li>'; tocHtml += '</li>';
}); });
@ -78,7 +78,7 @@ export default class TableOfContents {
elem.innerHTML = tocHtml; elem.innerHTML = tocHtml;
this.replaceLinks(elem, (href) => { this.replaceLinks(elem, (href) => {
let relative = rendition.book.path.relative(href); const relative = rendition.book.path.relative(href);
rendition.display(relative); rendition.display(relative);
this.destroy(); this.destroy();
}); });

2
src/plugins/experimentalWarnings/plugin.js
View file

@ -1,6 +1,8 @@
define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function (connectionManager, globalize, userSettings, appHost) { define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function (connectionManager, globalize, userSettings, appHost) {
'use strict'; 'use strict';
appHost = appHost.default || appHost;
// TODO: Replace with date-fns // TODO: Replace with date-fns
// https://stackoverflow.com/questions/6117814/get-week-of-year-in-javascript-like-in-php // https://stackoverflow.com/questions/6117814/get-week-of-year-in-javascript-like-in-php
function getWeek(date) { function getWeek(date) {

4
src/plugins/htmlVideoPlayer/plugin.js
View file

@ -105,7 +105,7 @@ function tryRemoveElement(elem) {
} }
function hidePrePlaybackPage() { function hidePrePlaybackPage() {
let animatedPage = document.querySelector('.page:not(.hide)'); const animatedPage = document.querySelector('.page:not(.hide)');
animatedPage.classList.add('hide'); animatedPage.classList.add('hide');
// At this point, we must hide the scrollbar placeholder, so it's not being displayed while the item is being loaded // At this point, we must hide the scrollbar placeholder, so it's not being displayed while the item is being loaded
document.body.classList.remove('force-scroll'); document.body.classList.remove('force-scroll');
@ -1299,7 +1299,7 @@ function tryRemoveElement(elem) {
} }
let html = ''; let html = '';
let cssClass = 'htmlvideoplayer'; const cssClass = 'htmlvideoplayer';
// Can't autoplay in these browsers so we need to use the full controls, at least until playback starts // Can't autoplay in these browsers so we need to use the full controls, at least until playback starts
if (!appHost.supports('htmlvideoautoplay')) { if (!appHost.supports('htmlvideoautoplay')) {

4
src/scripts/apploader.js
View file

@ -1,12 +1,10 @@
(function() { (function() {
'use strict';
function injectScriptElement(src, onload) { function injectScriptElement(src, onload) {
if (!src) { if (!src) {
return; return;
} }
var script = document.createElement('script'); const script = document.createElement('script');
if (self.dashboardVersion) { if (self.dashboardVersion) {
src += `?v=${self.dashboardVersion}`; src += `?v=${self.dashboardVersion}`;
} }

2
src/scripts/datetime.js
View file

@ -24,7 +24,7 @@ import globalize from 'globalize';
// parse strings, leading zeros into proper ints // parse strings, leading zeros into proper ints
const a = [1, 2, 3, 4, 5, 6, 10, 11]; const a = [1, 2, 3, 4, 5, 6, 10, 11];
for (let i in a) { for (const i in a) {
d[a[i]] = parseInt(d[a[i]], 10); d[a[i]] = parseInt(d[a[i]], 10);
} }
d[7] = parseFloat(d[7]); d[7] = parseFloat(d[7]);

4
src/scripts/deleteHelper.js
View file

@ -15,7 +15,7 @@ export function deleteItem(options) {
const item = options.item; const item = options.item;
const parentId = item.SeasonId || item.SeriesId || item.ParentId; const parentId = item.SeasonId || item.SeriesId || item.ParentId;
let apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = connectionManager.getApiClient(item.ServerId);
return confirm({ return confirm({
@ -34,7 +34,7 @@ export function deleteItem(options) {
} }
} }
}, function (err) { }, function (err) {
let result = function () { const result = function () {
return Promise.reject(err); return Promise.reject(err);
}; };

2
src/scripts/gamepadtokey.js
View file

@ -22,6 +22,8 @@
require(['apphost'], function (appHost) { require(['apphost'], function (appHost) {
'use strict'; 'use strict';
appHost = appHost.default || appHost;
var _GAMEPAD_A_BUTTON_INDEX = 0; var _GAMEPAD_A_BUTTON_INDEX = 0;
var _GAMEPAD_B_BUTTON_INDEX = 1; var _GAMEPAD_B_BUTTON_INDEX = 1;
var _GAMEPAD_DPAD_UP_BUTTON_INDEX = 12; var _GAMEPAD_DPAD_UP_BUTTON_INDEX = 12;

4
src/scripts/globalize.js
View file

@ -63,11 +63,11 @@ import events from 'events';
} }
function ensureTranslations(culture) { function ensureTranslations(culture) {
for (let i in allTranslations) { for (const i in allTranslations) {
ensureTranslation(allTranslations[i], culture); ensureTranslation(allTranslations[i], culture);
} }
if (culture !== fallbackCulture) { if (culture !== fallbackCulture) {
for (let i in allTranslations) { for (const i in allTranslations) {
ensureTranslation(allTranslations[i], fallbackCulture); ensureTranslation(allTranslations[i], fallbackCulture);
} }
} }

2
src/scripts/inputManager.js
View file

@ -39,7 +39,7 @@ import appHost from 'apphost';
dom.removeEventListener(scope, 'command', fn, {}); dom.removeEventListener(scope, 'command', fn, {});
} }
let commandTimes = {}; const commandTimes = {};
function checkCommandTime(command) { function checkCommandTime(command) {
const last = commandTimes[command] || 0; const last = commandTimes[command] || 0;

20
src/scripts/site.js
View file

@ -271,17 +271,16 @@ function initClient() {
} }
function createConnectionManager() { function createConnectionManager() {
return require(['connectionManagerFactory', 'apphost', 'credentialprovider', 'events', 'userSettings'], function (ConnectionManager, apphost, credentialProvider, events, userSettings) { return require(['connectionManagerFactory', 'apphost', 'credentialprovider', 'events', 'userSettings'], function (ConnectionManager, appHost, credentialProvider, events, userSettings) {
appHost = appHost.default || appHost;
var credentialProviderInstance = new credentialProvider(); var credentialProviderInstance = new credentialProvider();
var promises = [apphost.getSyncProfile(), apphost.init()]; var promises = [appHost.init()];
return Promise.all(promises).then(function (responses) { return Promise.all(promises).then(function (responses) {
var deviceProfile = responses[0]; var capabilities = Dashboard.capabilities(appHost);
var capabilities = Dashboard.capabilities(apphost);
capabilities.DeviceProfile = deviceProfile; var connectionManager = new ConnectionManager(credentialProviderInstance, appHost.appName(), appHost.appVersion(), appHost.deviceName(), appHost.deviceId(), capabilities);
var connectionManager = new ConnectionManager(credentialProviderInstance, apphost.appName(), apphost.appVersion(), apphost.deviceName(), apphost.deviceId(), capabilities);
defineConnectionManager(connectionManager); defineConnectionManager(connectionManager);
bindConnectionManagerEvents(connectionManager, events, userSettings); bindConnectionManagerEvents(connectionManager, events, userSettings);
@ -292,7 +291,7 @@ function initClient() {
return require(['apiclient'], function (apiClientFactory) { return require(['apiclient'], function (apiClientFactory) {
console.debug('creating ApiClient singleton'); console.debug('creating ApiClient singleton');
var apiClient = new apiClientFactory(Dashboard.serverAddress(), apphost.appName(), apphost.appVersion(), apphost.deviceName(), apphost.deviceId()); var apiClient = new apiClientFactory(Dashboard.serverAddress(), appHost.appName(), appHost.appVersion(), appHost.deviceName(), appHost.deviceId());
apiClient.enableAutomaticNetworking = false; apiClient.enableAutomaticNetworking = false;
apiClient.manualAddressOnly = true; apiClient.manualAddressOnly = true;
@ -351,6 +350,7 @@ function initClient() {
function getLayoutManager(layoutManager, appHost) { function getLayoutManager(layoutManager, appHost) {
layoutManager = layoutManager.default || layoutManager; layoutManager = layoutManager.default || layoutManager;
appHost = appHost.default || appHost;
if (appHost.getDefaultLayout) { if (appHost.getDefaultLayout) {
layoutManager.defaultLayout = appHost.getDefaultLayout(); layoutManager.defaultLayout = appHost.getDefaultLayout();
} }
@ -470,6 +470,8 @@ function initClient() {
} }
require(['apphost', 'css!assets/css/librarybrowser'], function (appHost) { require(['apphost', 'css!assets/css/librarybrowser'], function (appHost) {
appHost = appHost.default || appHost;
loadPlugins(appHost, browser).then(function () { loadPlugins(appHost, browser).then(function () {
onAppReady(browser); onAppReady(browser);
}); });
@ -518,6 +520,8 @@ function initClient() {
// ensure that appHost is loaded in this point // ensure that appHost is loaded in this point
require(['apphost', 'appRouter'], function (appHost, appRouter) { require(['apphost', 'appRouter'], function (appHost, appRouter) {
appHost = appHost.default || appHost;
window.Emby = {}; window.Emby = {};
console.debug('onAppReady: loading dependencies'); console.debug('onAppReady: loading dependencies');