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

Merge branch 'es6' into migrate-to-ES6-33

Browse source
This commit is contained in:
dkanada 2020-07-23 11:59:30 +09:00 • committed by GitHub
commit 3eada38dd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
60 changed files with 1085 additions and 996 deletions
Download patch file Download diff file Expand all files Collapse all files

24
package.json
View file

@ -122,6 +122,8 @@
"src/components/maintabsmanager.js", "src/components/maintabsmanager.js",
"src/components/mediaLibraryCreator/mediaLibraryCreator.js", "src/components/mediaLibraryCreator/mediaLibraryCreator.js",
"src/components/mediaLibraryEditor/mediaLibraryEditor.js", "src/components/mediaLibraryEditor/mediaLibraryEditor.js",
"src/components/metadataEditor/metadataEditor.js",
"src/components/metadataEditor/personEditor.js",
"src/components/nowPlayingBar/nowPlayingBar.js", "src/components/nowPlayingBar/nowPlayingBar.js",
"src/components/listview/listview.js", "src/components/listview/listview.js",
"src/components/playback/brightnessosd.js", "src/components/playback/brightnessosd.js",
@ -133,6 +135,7 @@
"src/components/playback/playmethodhelper.js", "src/components/playback/playmethodhelper.js",
"src/components/playback/remotecontrolautoplay.js", "src/components/playback/remotecontrolautoplay.js",
"src/components/playback/volumeosd.js", "src/components/playback/volumeosd.js",
"src/components/playerstats/playerstats.js",
"src/components/prompt/prompt.js", "src/components/prompt/prompt.js",
"src/components/playbackSettings/playbackSettings.js", "src/components/playbackSettings/playbackSettings.js",
"src/components/playlisteditor/playlisteditor.js", "src/components/playlisteditor/playlisteditor.js",
@ -160,6 +163,8 @@
"src/controllers/dashboard/dashboard.js", "src/controllers/dashboard/dashboard.js",
"src/controllers/dashboard/encodingsettings.js", "src/controllers/dashboard/encodingsettings.js",
"src/controllers/dashboard/logs.js", "src/controllers/dashboard/logs.js",
"src/controllers/user/menu.js",
"src/controllers/user/profile.js",
"src/controllers/user/subtitles.js", "src/controllers/user/subtitles.js",
"src/controllers/dashboard/general.js", "src/controllers/dashboard/general.js",
"src/controllers/dashboard/librarydisplay.js", "src/controllers/dashboard/librarydisplay.js",
@ -171,6 +176,11 @@
"src/controllers/dashboard/networking.js", "src/controllers/dashboard/networking.js",
"src/controllers/dashboard/playback.js", "src/controllers/dashboard/playback.js",
"src/controllers/dashboard/plugins/repositories.js", "src/controllers/dashboard/plugins/repositories.js",
"src/controllers/wizard/finish.js",
"src/controllers/wizard/remoteaccess.js",
"src/controllers/wizard/settings.js",
"src/controllers/wizard/start.js",
"src/controllers/wizard/user.js",
"src/controllers/shows/episodes.js", "src/controllers/shows/episodes.js",
"src/controllers/shows/tvgenres.js", "src/controllers/shows/tvgenres.js",
"src/controllers/shows/tvlatest.js", "src/controllers/shows/tvlatest.js",
@ -216,6 +226,9 @@
"src/plugins/photoPlayer/plugin.js", "src/plugins/photoPlayer/plugin.js",
"src/scripts/alphanumericshortcuts.js", "src/scripts/alphanumericshortcuts.js",
"src/scripts/autoBackdrops.js", "src/scripts/autoBackdrops.js",
"src/scripts/settings/appSettings.js",
"src/scripts/settings/userSettings.js",
"src/scripts/settings/webSettings.js",
"src/scripts/datetime.js", "src/scripts/datetime.js",
"src/scripts/deleteHelper.js", "src/scripts/deleteHelper.js",
"src/scripts/dfnshelper.js", "src/scripts/dfnshelper.js",
@ -228,11 +241,16 @@
"src/plugins/youtubePlayer/plugin.js", "src/plugins/youtubePlayer/plugin.js",
"src/components/filterdialog/filterdialog.js", "src/components/filterdialog/filterdialog.js",
"src/components/fetchhelper.js", "src/components/fetchhelper.js",
"src/scripts/editorsidebar.js",
"src/scripts/globalize.js",
"src/scripts/playlists.js",
"src/scripts/keyboardNavigation.js", "src/scripts/keyboardNavigation.js",
"src/scripts/settings/appSettings.js", "src/scripts/taskbutton.js",
"src/scripts/settings/userSettings.js", "src/scripts/touchHelper.js",
"src/scripts/themeLoader.js", "src/scripts/themeLoader.js",
"src/scripts/settings/webSettings.js" "src/plugins/backdropScreensaver/plugin.js",
"src/components/filterdialog/filterdialog.js",
"src/components/fetchhelper.js"
], ],
"plugins": [ "plugins": [
"@babel/plugin-transform-modules-amd", "@babel/plugin-transform-modules-amd",

5
src/components/accessSchedule/accessSchedule.js
View file

@ -59,15 +59,14 @@ import 'formDialogStyle';
export function show(options) { export function show(options) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// TODO: remove require import('text!./components/accessSchedule/accessSchedule.template.html').then(({default: template}) => {
require(['text!./components/accessSchedule/accessSchedule.template.html'], template => {
const dlg = dialogHelper.createDialog({ const dlg = dialogHelper.createDialog({
removeOnClose: true, removeOnClose: true,
size: 'small' size: 'small'
}); });
dlg.classList.add('formDialog'); dlg.classList.add('formDialog');
let html = ''; let html = '';
html += globalize.translateDocument(template); html += globalize.translateHtml(template);
dlg.innerHTML = html; dlg.innerHTML = html;
populateHours(dlg); populateHours(dlg);
loadSchedule(dlg, options.schedule); loadSchedule(dlg, options.schedule);

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

@ -73,7 +73,7 @@ function getPosition(options, dlg) {
} }
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
require(['scrollHelper'], function (scrollHelper) { import('scrollHelper').then(({default: scrollHelper}) => {
const fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });

2
src/components/appRouter.js
View file

@ -465,7 +465,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
function loadContent(ctx, route, html, request) { function loadContent(ctx, route, html, request) {
html = globalize.translateDocument(html, route.dictionary); html = globalize.translateHtml(html, route.dictionary);
request.view = html; request.view = html;
viewManager.loadView(request); viewManager.loadView(request);

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

@ -1160,10 +1160,10 @@ import 'programStyles';
/** /**
* Imports the refresh indicator element. * Imports the refresh indicator element.
*/ */
function requireRefreshIndicator() { function importRefreshIndicator() {
if (!refreshIndicatorLoaded) { if (!refreshIndicatorLoaded) {
refreshIndicatorLoaded = true; refreshIndicatorLoaded = true;
require(['emby-itemrefreshindicator']); import('emby-itemrefreshindicator');
} }
} }
@ -1414,7 +1414,7 @@ import 'programStyles';
if (item.Type === 'CollectionFolder' || item.CollectionType) { if (item.Type === 'CollectionFolder' || item.CollectionType) {
const refreshClass = item.RefreshProgress ? '' : ' class="hide"'; const refreshClass = item.RefreshProgress ? '' : ' class="hide"';
indicatorsHtml += '<div is="emby-itemrefreshindicator"' + refreshClass + ' data-progress="' + (item.RefreshProgress || 0) + '" data-status="' + item.RefreshStatus + '"></div>'; indicatorsHtml += '<div is="emby-itemrefreshindicator"' + refreshClass + ' data-progress="' + (item.RefreshProgress || 0) + '" data-status="' + item.RefreshStatus + '"></div>';
requireRefreshIndicator(); importRefreshIndicator();
} }
if (indicatorsHtml) { if (indicatorsHtml) {
@ -1495,7 +1495,7 @@ import 'programStyles';
const userData = item.UserData || {}; const userData = item.UserData || {};
if (itemHelper.canMarkPlayed(item)) { if (itemHelper.canMarkPlayed(item)) {
require(['emby-playstatebutton']); import('emby-playstatebutton');
html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover check"></span></button>'; html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover check"></span></button>';
} }
@ -1503,7 +1503,7 @@ import 'programStyles';
const likes = userData.Likes == null ? '' : userData.Likes; const likes = userData.Likes == null ? '' : userData.Likes;
require(['emby-ratingbutton']); import('emby-ratingbutton');
html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover favorite"></span></button>'; html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover favorite"></span></button>';
} }

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

@ -157,7 +157,7 @@ import 'emby-button';
} }
function alertTextWithOptions(options) { function alertTextWithOptions(options) {
require(['alert'], alert => { import('alert').then(({default: alert}) => {
alert(options); alert(options);
}); });
} }

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

@ -412,7 +412,7 @@ import 'css!./style.css';
dlg.classList.add('background-theme-a'); dlg.classList.add('background-theme-a');
dlg.classList.add('formDialog'); dlg.classList.add('formDialog');
dlg.classList.add('filterDialog'); dlg.classList.add('filterDialog');
dlg.innerHTML = globalize.translateDocument(template); dlg.innerHTML = globalize.translateHtml(template);
setVisibility(dlg, this.options); setVisibility(dlg, this.options);
dialogHelper.open(dlg); dialogHelper.open(dlg);
dlg.addEventListener('close', resolve); dlg.addEventListener('close', resolve);

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

@ -286,7 +286,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
html += template; html += template;
dlg.innerHTML = globalize.translateDocument(html, 'core'); dlg.innerHTML = globalize.translateHtml(html, 'core');
var settingElements = dlg.querySelectorAll('.viewSetting'); var settingElements = dlg.querySelectorAll('.viewSetting');
for (var i = 0, length = settingElements.length; i < length; i++) { for (var i = 0, length = settingElements.length; i < length; i++) {

2
src/components/guide/guide-settings.js
View file

@ -114,7 +114,7 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
var html = ''; var html = '';
html += globalize.translateDocument(template, 'core'); html += globalize.translateHtml(template, 'core');
dlg.innerHTML = html; dlg.innerHTML = html;

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

@ -1151,7 +1151,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
context.classList.add('tvguide'); context.classList.add('tvguide');
context.innerHTML = globalize.translateDocument(template, 'core'); context.innerHTML = globalize.translateHtml(template, 'core');
programGrid = context.querySelector('.programGrid'); programGrid = context.querySelector('.programGrid');
var timeslotHeaders = context.querySelector('.timeslotHeaders'); var timeslotHeaders = context.querySelector('.timeslotHeaders');

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

@ -464,7 +464,7 @@ import 'emby-checkbox';
template = template.replace(`{section${i}label}`, globalize.translate('LabelHomeScreenSectionValue', i)); template = template.replace(`{section${i}label}`, globalize.translate('LabelHomeScreenSectionValue', i));
} }
options.element.innerHTML = globalize.translateDocument(template, 'core'); options.element.innerHTML = globalize.translateHtml(template, 'core');
options.element.querySelector('.viewOrderList').addEventListener('click', onSectionOrderListClick); options.element.querySelector('.viewOrderList').addEventListener('click', onSectionOrderListClick);
options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self)); options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self));

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

@ -339,7 +339,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
var dlg = dialogHelper.createDialog(dialogOptions); var dlg = dialogHelper.createDialog(dialogOptions);
dlg.innerHTML = globalize.translateDocument(template, 'core'); dlg.innerHTML = globalize.translateHtml(template, 'core');
if (layoutManager.tv) { if (layoutManager.tv) {
scrollHelper.centerFocus.on(dlg, false); scrollHelper.centerFocus.on(dlg, false);

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

@ -92,7 +92,7 @@ define(['globalize', 'dom', 'dialogHelper', 'emby-checkbox', 'emby-select', 'emb
scrollY: false scrollY: false
}); });
dlg.classList.add('formDialog'); dlg.classList.add('formDialog');
dlg.innerHTML = globalize.translateDocument(template); dlg.innerHTML = globalize.translateHtml(template);
dlg.addEventListener('close', function () { dlg.addEventListener('close', function () {
saveValues(dlg, options); saveValues(dlg, options);
}); });

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

@ -161,7 +161,7 @@ import 'css!./style';
dlg.classList.add('formDialog'); dlg.classList.add('formDialog');
dlg.innerHTML = globalize.translateDocument(template, 'core'); dlg.innerHTML = globalize.translateHtml(template, 'core');
if (layoutManager.tv) { if (layoutManager.tv) {
scrollHelper.centerFocus.on(dlg, false); scrollHelper.centerFocus.on(dlg, false);

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

@ -464,7 +464,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
dlg.classList.add('formDialog'); dlg.classList.add('formDialog');
dlg.innerHTML = globalize.translateDocument(template, 'core'); dlg.innerHTML = globalize.translateHtml(template, 'core');
if (layoutManager.tv) { if (layoutManager.tv) {
scrollHelper.centerFocus.on(dlg, false); scrollHelper.centerFocus.on(dlg, false);

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

@ -150,7 +150,7 @@ import 'flexStyles';
const dlg = dialogHelper.createDialog(dialogOptions); const dlg = dialogHelper.createDialog(dialogOptions);
dlg.classList.add('formDialog'); dlg.classList.add('formDialog');
let html = ''; let html = '';
html += globalize.translateDocument(template, 'core'); html += globalize.translateHtml(template, 'core');
dlg.innerHTML = html; dlg.innerHTML = html;
if (layoutManager.tv) { if (layoutManager.tv) {
dlg.querySelector('.formDialogContent'); dlg.querySelector('.formDialogContent');

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

@ -382,7 +382,7 @@ import 'cardStyle';
dlg.classList.add('recordingDialog'); dlg.classList.add('recordingDialog');
let html = ''; let html = '';
html += globalize.translateDocument(template, 'core'); html += globalize.translateHtml(template, 'core');
dlg.innerHTML = html; dlg.innerHTML = html;
@ -464,7 +464,7 @@ import 'cardStyle';
dlg.classList.add('recordingDialog'); dlg.classList.add('recordingDialog');
let html = ''; let html = '';
html += globalize.translateDocument(template, 'core'); html += globalize.translateHtml(template, 'core');
dlg.innerHTML = html; dlg.innerHTML = html;

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

@ -359,7 +359,7 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
xhr.open('GET', 'components/libraryoptionseditor/libraryoptionseditor.template.html', true); xhr.open('GET', 'components/libraryoptionseditor/libraryoptionseditor.template.html', true);
xhr.onload = function(e) { xhr.onload = function(e) {
var template = this.response; var template = this.response;
parent.innerHTML = globalize.translateDocument(template); parent.innerHTML = globalize.translateHtml(template);
populateRefreshInterval(parent.querySelector('#selectAutoRefreshInterval')); populateRefreshInterval(parent.querySelector('#selectAutoRefreshInterval'));
var promises = [populateLanguages(parent), populateCountries(parent.querySelector('#selectCountry'))]; var promises = [populateLanguages(parent), populateCountries(parent.querySelector('#selectCountry'))];
Promise.all(promises).then(function() { Promise.all(promises).then(function() {

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

@ -211,7 +211,7 @@ export class showEditor {
dlg.classList.add('background-theme-a'); dlg.classList.add('background-theme-a');
dlg.classList.add('dlg-librarycreator'); dlg.classList.add('dlg-librarycreator');
dlg.classList.add('formDialog'); dlg.classList.add('formDialog');
dlg.innerHTML = globalize.translateDocument(template); dlg.innerHTML = globalize.translateHtml(template);
initEditor(dlg, options.collectionTypeOptions); initEditor(dlg, options.collectionTypeOptions);
dlg.addEventListener('close', onDialogClosed); dlg.addEventListener('close', onDialogClosed);
dialogHelper.open(dlg); dialogHelper.open(dlg);

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

@ -226,7 +226,7 @@ export class showEditor {
dlg.classList.add('ui-body-a'); dlg.classList.add('ui-body-a');
dlg.classList.add('background-theme-a'); dlg.classList.add('background-theme-a');
dlg.classList.add('formDialog'); dlg.classList.add('formDialog');
dlg.innerHTML = globalize.translateDocument(template); dlg.innerHTML = globalize.translateHtml(template);
dlg.querySelector('.formDialogHeaderTitle').innerHTML = options.library.Name; dlg.querySelector('.formDialogHeaderTitle').innerHTML = options.library.Name;
initEditor(dlg, options); initEditor(dlg, options);
dlg.addEventListener('close', onDialogClosed); dlg.addEventListener('close', onDialogClosed);

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

@ -1,9 +1,30 @@
define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loading', 'focusManager', 'connectionManager', 'globalize', 'require', 'shell', 'emby-checkbox', 'emby-input', 'emby-select', 'listViewStyle', 'emby-textarea', 'emby-button', 'paper-icon-button-light', 'css!./../formdialog', 'clearButtonStyle', 'flexStyles'], function (itemHelper, dom, layoutManager, dialogHelper, datetime, loading, focusManager, connectionManager, globalize, require, shell) { import itemHelper from 'itemHelper';
'use strict'; import dom from 'dom';
import layoutManager from 'layoutManager';
import dialogHelper from 'dialogHelper';
import datetime from 'datetime';
import loading from 'loading';
import focusManager from 'focusManager';
import connectionManager from 'connectionManager';
import globalize from 'globalize';
import require from 'require';
import shell from 'shell';
import 'emby-checkbox';
import 'emby-input';
import 'emby-select';
import 'listViewStyle';
import 'emby-textarea';
import 'emby-button';
import 'paper-icon-button-light';
import 'css!./../formdialog';
import 'clearButtonStyle';
import 'flexStyles';
var currentContext; /* eslint-disable indent */
var metadataEditorInfo;
var currentItem; let currentContext;
let metadataEditorInfo;
let currentItem;
function isDialog() { function isDialog() {
return currentContext.classList.contains('dialog'); return currentContext.classList.contains('dialog');
@ -28,11 +49,11 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
closeDialog(true); closeDialog(true);
} }
var apiClient = getApiClient(); const apiClient = getApiClient();
apiClient.updateItem(item).then(function () { apiClient.updateItem(item).then(function () {
var newContentType = form.querySelector('#selectContentType').value || ''; const newContentType = form.querySelector('#selectContentType').value || '';
if ((metadataEditorInfo.ContentType || '') !== newContentType) { if ((metadataEditorInfo.ContentType || '') !== newContentType) {
@ -56,7 +77,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
} }
function getSelectedAirDays(form) { function getSelectedAirDays(form) {
var checkedItems = form.querySelectorAll('.chkAirDay:checked') || []; const checkedItems = form.querySelectorAll('.chkAirDay:checked') || [];
return Array.prototype.map.call(checkedItems, function (c) { return Array.prototype.map.call(checkedItems, function (c) {
return c.getAttribute('data-day'); return c.getAttribute('data-day');
}); });
@ -92,7 +113,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
function getDateValue(form, element, property) { function getDateValue(form, element, property) {
var val = form.querySelector(element).value; let val = form.querySelector(element).value;
if (!val) { if (!val) {
return null; return null;
@ -100,14 +121,14 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
if (currentItem[property]) { if (currentItem[property]) {
var date = datetime.parseISO8601Date(currentItem[property], true); const date = datetime.parseISO8601Date(currentItem[property], true);
var parts = date.toISOString().split('T'); const parts = date.toISOString().split('T');
// If the date is the same, preserve the time // If the date is the same, preserve the time
if (parts[0].indexOf(val) === 0) { if (parts[0].indexOf(val) === 0) {
var iso = parts[1]; const iso = parts[1];
val += 'T' + iso; val += 'T' + iso;
} }
@ -120,9 +141,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
loading.show(); loading.show();
var form = this; const form = this;
var item = { const item = {
Id: currentItem.Id, Id: currentItem.Id,
Name: form.querySelector('#txtName').value, Name: form.querySelector('#txtName').value,
OriginalTitle: form.querySelector('#txtOriginalName').value, OriginalTitle: form.querySelector('#txtOriginalName').value,
@ -168,9 +189,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
item.ProviderIds = Object.assign({}, currentItem.ProviderIds); item.ProviderIds = Object.assign({}, currentItem.ProviderIds);
var idElements = form.querySelectorAll('.txtExternalId'); const idElements = form.querySelectorAll('.txtExternalId');
Array.prototype.map.call(idElements, function (idElem) { Array.prototype.map.call(idElements, function (idElem) {
var providerKey = idElem.getAttribute('data-providerkey'); const providerKey = idElem.getAttribute('data-providerkey');
item.ProviderIds[providerKey] = idElem.value; item.ProviderIds[providerKey] = idElem.value;
}); });
@ -179,7 +200,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
if (currentItem.Type === 'Person') { if (currentItem.Type === 'Person') {
var placeOfBirth = form.querySelector('#txtPlaceOfBirth').value; const placeOfBirth = form.querySelector('#txtPlaceOfBirth').value;
item.ProductionLocations = placeOfBirth ? [placeOfBirth] : []; item.ProductionLocations = placeOfBirth ? [placeOfBirth] : [];
} }
@ -187,11 +208,11 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
if (currentItem.Type === 'Series') { if (currentItem.Type === 'Series') {
// 600000000 // 600000000
var seriesRuntime = form.querySelector('#txtSeriesRuntime').value; const seriesRuntime = form.querySelector('#txtSeriesRuntime').value;
item.RunTimeTicks = seriesRuntime ? (seriesRuntime * 600000000) : null; item.RunTimeTicks = seriesRuntime ? (seriesRuntime * 600000000) : null;
} }
var tagline = form.querySelector('#txtTagline').value; const tagline = form.querySelector('#txtTagline').value;
item.Taglines = tagline ? [tagline] : []; item.Taglines = tagline ? [tagline] : [];
submitUpdatedItem(form, item); submitUpdatedItem(form, item);
@ -215,8 +236,8 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
prompt.default({ prompt.default({
label: 'Value:' label: 'Value:'
}).then(function (text) { }).then(function (text) {
var list = dom.parentWithClass(source, 'editableListviewContainer').querySelector('.paperList'); const list = dom.parentWithClass(source, 'editableListviewContainer').querySelector('.paperList');
var items = getListValues(list); const items = getListValues(list);
items.push(text); items.push(text);
populateListView(list, items, sortCallback); populateListView(list, items, sortCallback);
}); });
@ -224,7 +245,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
} }
function removeElementFromList(source) { function removeElementFromList(source) {
var el = dom.parentWithClass(source, 'listItem'); const el = dom.parentWithClass(source, 'listItem');
el.parentNode.removeChild(el); el.parentNode.removeChild(el);
} }
@ -234,7 +255,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
personEditor.show(person).then(function (updatedPerson) { personEditor.show(person).then(function (updatedPerson) {
var isNew = index === -1; const isNew = index === -1;
if (isNew) { if (isNew) {
currentItem.People.push(updatedPerson); currentItem.People.push(updatedPerson);
@ -247,13 +268,13 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
function onEditorClick(e) { function onEditorClick(e) {
var btnRemoveFromEditorList = dom.parentWithClass(e.target, 'btnRemoveFromEditorList'); const btnRemoveFromEditorList = dom.parentWithClass(e.target, 'btnRemoveFromEditorList');
if (btnRemoveFromEditorList) { if (btnRemoveFromEditorList) {
removeElementFromList(btnRemoveFromEditorList); removeElementFromList(btnRemoveFromEditorList);
return; return;
} }
var btnAddTextItem = dom.parentWithClass(e.target, 'btnAddTextItem'); const btnAddTextItem = dom.parentWithClass(e.target, 'btnAddTextItem');
if (btnAddTextItem) { if (btnAddTextItem) {
addElementToList(btnAddTextItem); addElementToList(btnAddTextItem);
} }
@ -264,7 +285,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
} }
function bindAll(elems, eventName, fn) { function bindAll(elems, eventName, fn) {
for (var i = 0, length = elems.length; i < length; i++) { for (let i = 0, length = elems.length; i < length; i++) {
elems[i].addEventListener(eventName, fn); elems[i].addEventListener(eventName, fn);
} }
} }
@ -272,11 +293,11 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
function init(context, apiClient) { function init(context, apiClient) {
context.querySelector('.externalIds').addEventListener('click', function (e) { context.querySelector('.externalIds').addEventListener('click', function (e) {
var btnOpenExternalId = dom.parentWithClass(e.target, 'btnOpenExternalId'); const btnOpenExternalId = dom.parentWithClass(e.target, 'btnOpenExternalId');
if (btnOpenExternalId) { if (btnOpenExternalId) {
var field = context.querySelector('#' + btnOpenExternalId.getAttribute('data-fieldid')); const field = context.querySelector('#' + btnOpenExternalId.getAttribute('data-fieldid'));
var formatString = field.getAttribute('data-formatstring'); const formatString = field.getAttribute('data-formatstring');
if (field.value) { if (field.value) {
shell.openUrl(formatString.replace('{0}', field.value)); shell.openUrl(formatString.replace('{0}', field.value));
@ -311,7 +332,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
context.removeEventListener('click', onEditorClick); context.removeEventListener('click', onEditorClick);
context.addEventListener('click', onEditorClick); context.addEventListener('click', onEditorClick);
var form = context.querySelector('form'); const form = context.querySelector('form');
form.removeEventListener('submit', onSubmit); form.removeEventListener('submit', onSubmit);
form.addEventListener('submit', onSubmit); form.addEventListener('submit', onSubmit);
@ -322,15 +343,15 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
context.querySelector('#peopleList').addEventListener('click', function (e) { context.querySelector('#peopleList').addEventListener('click', function (e) {
var index; let index;
var btnDeletePerson = dom.parentWithClass(e.target, 'btnDeletePerson'); const btnDeletePerson = dom.parentWithClass(e.target, 'btnDeletePerson');
if (btnDeletePerson) { if (btnDeletePerson) {
index = parseInt(btnDeletePerson.getAttribute('data-index')); index = parseInt(btnDeletePerson.getAttribute('data-index'));
currentItem.People.splice(index, 1); currentItem.People.splice(index, 1);
populatePeople(context, currentItem.People); populatePeople(context, currentItem.People);
} }
var btnEditPerson = dom.parentWithClass(e.target, 'btnEditPerson'); const btnEditPerson = dom.parentWithClass(e.target, 'btnEditPerson');
if (btnEditPerson) { if (btnEditPerson) {
index = parseInt(btnEditPerson.getAttribute('data-index')); index = parseInt(btnEditPerson.getAttribute('data-index'));
editPerson(context, currentItem.People[index], index); editPerson(context, currentItem.People[index], index);
@ -340,7 +361,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
function getItem(itemId, serverId) { function getItem(itemId, serverId) {
var apiClient = connectionManager.getApiClient(serverId); const apiClient = connectionManager.getApiClient(serverId);
if (itemId) { if (itemId) {
return apiClient.getItem(apiClient.getCurrentUserId(), itemId); return apiClient.getItem(apiClient.getCurrentUserId(), itemId);
@ -351,7 +372,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
function getEditorConfig(itemId, serverId) { function getEditorConfig(itemId, serverId) {
var apiClient = connectionManager.getApiClient(serverId); const apiClient = connectionManager.getApiClient(serverId);
if (itemId) { if (itemId) {
return apiClient.getJSON(apiClient.getUrl('Items/' + itemId + '/MetadataEditor')); return apiClient.getJSON(apiClient.getUrl('Items/' + itemId + '/MetadataEditor'));
@ -362,13 +383,13 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
function populateCountries(select, allCountries) { function populateCountries(select, allCountries) {
var html = ''; let html = '';
html += "<option value=''></option>"; html += "<option value=''></option>";
for (var i = 0, length = allCountries.length; i < length; i++) { for (let i = 0, length = allCountries.length; i < length; i++) {
var culture = allCountries[i]; const culture = allCountries[i];
html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + '</option>'; html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + '</option>';
} }
@ -378,13 +399,13 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
function populateLanguages(select, languages) { function populateLanguages(select, languages) {
var html = ''; let html = '';
html += "<option value=''></option>"; html += "<option value=''></option>";
for (var i = 0, length = languages.length; i < length; i++) { for (let i = 0, length = languages.length; i < length; i++) {
var culture = languages[i]; const culture = languages[i];
html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + '</option>'; html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + '</option>';
} }
@ -400,41 +421,41 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
showElement('#fldContentType', context); showElement('#fldContentType', context);
} }
var html = metadataInfo.ContentTypeOptions.map(function (i) { const html = metadataInfo.ContentTypeOptions.map(function (i) {
return '<option value="' + i.Value + '">' + i.Name + '</option>'; return '<option value="' + i.Value + '">' + i.Name + '</option>';
}).join(''); }).join('');
var selectEl = context.querySelector('#selectContentType'); const selectEl = context.querySelector('#selectContentType');
selectEl.innerHTML = html; selectEl.innerHTML = html;
selectEl.value = metadataInfo.ContentType || ''; selectEl.value = metadataInfo.ContentType || '';
} }
function loadExternalIds(context, item, externalIds) { function loadExternalIds(context, item, externalIds) {
var html = ''; let html = '';
var providerIds = item.ProviderIds || {}; const providerIds = item.ProviderIds || {};
for (var i = 0, length = externalIds.length; i < length; i++) { for (let i = 0, length = externalIds.length; i < length; i++) {
var idInfo = externalIds[i]; const idInfo = externalIds[i];
var id = 'txt1' + idInfo.Key; const id = 'txt1' + idInfo.Key;
var formatString = idInfo.UrlFormatString || ''; const formatString = idInfo.UrlFormatString || '';
var fullName = idInfo.Name; let fullName = idInfo.Name;
if (idInfo.Type) { if (idInfo.Type) {
fullName = idInfo.Name + ' ' + globalize.translate(idInfo.Type); fullName = idInfo.Name + ' ' + globalize.translate(idInfo.Type);
} }
var labelText = globalize.translate('LabelDynamicExternalId', fullName); const labelText = globalize.translate('LabelDynamicExternalId', fullName);
html += '<div class="inputContainer">'; html += '<div class="inputContainer">';
html += '<div class="flex align-items-center">'; html += '<div class="flex align-items-center">';
var value = providerIds[idInfo.Key] || ''; const value = providerIds[idInfo.Key] || '';
html += '<div class="flex-grow">'; html += '<div class="flex-grow">';
html += '<input is="emby-input" class="txtExternalId" value="' + value + '" data-providerkey="' + idInfo.Key + '" data-formatstring="' + formatString + '" id="' + id + '" label="' + labelText + '"/>'; html += '<input is="emby-input" class="txtExternalId" value="' + value + '" data-providerkey="' + idInfo.Key + '" data-formatstring="' + formatString + '" id="' + id + '" label="' + labelText + '"/>';
@ -448,7 +469,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
html += '</div>'; html += '</div>';
} }
var elem = context.querySelector('.externalIds', context); const elem = context.querySelector('.externalIds', context);
elem.innerHTML = html; elem.innerHTML = html;
if (externalIds.length) { if (externalIds.length) {
@ -465,7 +486,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
context = context || document; context = context || document;
if (typeof selector === 'string') { if (typeof selector === 'string') {
var elements = multiple ? context.querySelectorAll(selector) : [context.querySelector(selector)]; const elements = multiple ? context.querySelectorAll(selector) : [context.querySelector(selector)];
Array.prototype.forEach.call(elements, function (el) { Array.prototype.forEach.call(elements, function (el) {
if (el) { if (el) {
@ -484,7 +505,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
context = context || document; context = context || document;
if (typeof selector === 'string') { if (typeof selector === 'string') {
var elements = multiple ? context.querySelectorAll(selector) : [context.querySelector(selector)]; const elements = multiple ? context.querySelectorAll(selector) : [context.querySelector(selector)];
Array.prototype.forEach.call(elements, function (el) { Array.prototype.forEach.call(elements, function (el) {
if (el) { if (el) {
@ -686,7 +707,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
function fillItemInfo(context, item, parentalRatingOptions) { function fillItemInfo(context, item, parentalRatingOptions) {
var select = context.querySelector('#selectOfficialRating'); let select = context.querySelector('#selectOfficialRating');
populateRatings(parentalRatingOptions, select, item.OfficialRating); populateRatings(parentalRatingOptions, select, item.OfficialRating);
@ -698,7 +719,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
select.value = item.CustomRating || ''; select.value = item.CustomRating || '';
var selectStatus = context.querySelector('#selectStatus'); const selectStatus = context.querySelector('#selectStatus');
populateStatus(selectStatus); populateStatus(selectStatus);
selectStatus.value = item.Status || ''; selectStatus.value = item.Status || '';
@ -717,8 +738,8 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
populateListView(context.querySelector('#listTags'), item.Tags); populateListView(context.querySelector('#listTags'), item.Tags);
var lockData = (item.LockData || false); const lockData = (item.LockData || false);
var chkLockData = context.querySelector('#chkLockData'); const chkLockData = context.querySelector('#chkLockData');
chkLockData.checked = lockData; chkLockData.checked = lockData;
if (chkLockData.checked) { if (chkLockData.checked) {
hideElement('.providerSettingsContainer', context); hideElement('.providerSettingsContainer', context);
@ -756,7 +777,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
return a.Name; return a.Name;
}).join(';'); }).join(';');
var date; let date;
if (item.DateCreated) { if (item.DateCreated) {
try { try {
@ -798,7 +819,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
context.querySelector('#txtAirTime').value = item.AirTime || ''; context.querySelector('#txtAirTime').value = item.AirTime || '';
var placeofBirth = item.ProductionLocations && item.ProductionLocations.length ? item.ProductionLocations[0] : ''; const placeofBirth = item.ProductionLocations && item.ProductionLocations.length ? item.ProductionLocations[0] : '';
context.querySelector('#txtPlaceOfBirth').value = placeofBirth; context.querySelector('#txtPlaceOfBirth').value = placeofBirth;
context.querySelector('#txtOriginalAspectRatio').value = item.AspectRatio || ''; context.querySelector('#txtOriginalAspectRatio').value = item.AspectRatio || '';
@ -808,7 +829,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
if (item.RunTimeTicks) { if (item.RunTimeTicks) {
var minutes = item.RunTimeTicks / 600000000; const minutes = item.RunTimeTicks / 600000000;
context.querySelector('#txtSeriesRuntime').value = Math.round(minutes); context.querySelector('#txtSeriesRuntime').value = Math.round(minutes);
} else { } else {
@ -818,18 +839,16 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
function populateRatings(allParentalRatings, select, currentValue) { function populateRatings(allParentalRatings, select, currentValue) {
var html = ''; let html = '';
html += "<option value=''></option>"; html += "<option value=''></option>";
var ratings = []; const ratings = [];
var i; let rating;
var length;
var rating;
var currentValueFound = false; let currentValueFound = false;
for (i = 0, length = allParentalRatings.length; i < length; i++) { for (let i = 0, length = allParentalRatings.length; i < length; i++) {
rating = allParentalRatings[i]; rating = allParentalRatings[i];
@ -844,7 +863,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
ratings.push({ Name: currentValue, Value: currentValue }); ratings.push({ Name: currentValue, Value: currentValue });
} }
for (i = 0, length = ratings.length; i < length; i++) { for (let i = 0, length = ratings.length; i < length; i++) {
rating = ratings[i]; rating = ratings[i];
@ -855,7 +874,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
} }
function populateStatus(select) { function populateStatus(select) {
var html = ''; let html = '';
html += "<option value=''></option>"; html += "<option value=''></option>";
html += "<option value='Continuing'>" + globalize.translate('Continuing') + '</option>'; html += "<option value='Continuing'>" + globalize.translate('Continuing') + '</option>';
@ -873,8 +892,8 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
} else { } else {
items = sortCallback(items); items = sortCallback(items);
} }
var html = ''; let html = '';
for (var i = 0; i < items.length; i++) { for (let i = 0; i < items.length; i++) {
html += '<div class="listItem">'; html += '<div class="listItem">';
html += '<span class="material-icons listItemIcon live_tv" style="background-color:#333;"></span>'; html += '<span class="material-icons listItemIcon live_tv" style="background-color:#333;"></span>';
@ -897,14 +916,14 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
function populatePeople(context, people) { function populatePeople(context, people) {
var lastType = ''; let lastType = '';
var html = ''; let html = '';
var elem = context.querySelector('#peopleList'); const elem = context.querySelector('#peopleList');
for (var i = 0, length = people.length; i < length; i++) { for (let i = 0, length = people.length; i < length; i++) {
var person = people[i]; const person = people[i];
html += '<div class="listItem">'; html += '<div class="listItem">';
@ -934,13 +953,13 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
function getLockedFieldsHtml(fields, currentFields) { function getLockedFieldsHtml(fields, currentFields) {
var html = ''; let html = '';
for (var i = 0; i < fields.length; i++) { for (let i = 0; i < fields.length; i++) {
var field = fields[i]; const field = fields[i];
var name = field.name; const name = field.name;
var value = field.value || field.name; const value = field.value || field.name;
var checkedHtml = currentFields.indexOf(value) === -1 ? ' checked' : ''; const checkedHtml = currentFields.indexOf(value) === -1 ? ' checked' : '';
html += '<label>'; html += '<label>';
html += '<input type="checkbox" is="emby-checkbox" class="selectLockedField" data-value="' + value + '"' + checkedHtml + '/>'; html += '<input type="checkbox" is="emby-checkbox" class="selectLockedField" data-value="' + value + '"' + checkedHtml + '/>';
html += '<span>' + name + '</span>'; html += '<span>' + name + '</span>';
@ -950,10 +969,10 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
} }
function fillMetadataSettings(context, item, lockedFields) { function fillMetadataSettings(context, item, lockedFields) {
var container = context.querySelector('.providerSettingsContainer'); const container = context.querySelector('.providerSettingsContainer');
lockedFields = lockedFields || []; lockedFields = lockedFields || [];
var lockedFieldsList = [ const lockedFieldsList = [
{ name: globalize.translate('Name'), value: 'Name' }, { name: globalize.translate('Name'), value: 'Name' },
{ name: globalize.translate('Overview'), value: 'Overview' }, { name: globalize.translate('Overview'), value: 'Overview' },
{ name: globalize.translate('Genres'), value: 'Genres' }, { name: globalize.translate('Genres'), value: 'Genres' },
@ -974,7 +993,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
lockedFieldsList.push({ name: globalize.translate('Studios'), value: 'Studios' }); lockedFieldsList.push({ name: globalize.translate('Studios'), value: 'Studios' });
lockedFieldsList.push({ name: globalize.translate('Tags'), value: 'Tags' }); lockedFieldsList.push({ name: globalize.translate('Tags'), value: 'Tags' });
var html = ''; let html = '';
html += '<h2>' + globalize.translate('HeaderEnabledFields') + '</h2>'; html += '<h2>' + globalize.translate('HeaderEnabledFields') + '</h2>';
html += '<p>' + globalize.translate('HeaderEnabledFieldsHelp') + '</p>'; html += '<p>' + globalize.translate('HeaderEnabledFieldsHelp') + '</p>';
@ -988,13 +1007,13 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
Promise.all([getItem(itemId, serverId), getEditorConfig(itemId, serverId)]).then(function (responses) { Promise.all([getItem(itemId, serverId), getEditorConfig(itemId, serverId)]).then(function (responses) {
var item = responses[0]; const item = responses[0];
metadataEditorInfo = responses[1]; metadataEditorInfo = responses[1];
currentItem = item; currentItem = item;
var languages = metadataEditorInfo.Cultures; const languages = metadataEditorInfo.Cultures;
var countries = metadataEditorInfo.Countries; const countries = metadataEditorInfo.Countries;
renderContentTypeOptions(context, metadataEditorInfo); renderContentTypeOptions(context, metadataEditorInfo);
@ -1018,7 +1037,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
require(['scrollHelper'], function (scrollHelper) { require(['scrollHelper'], function (scrollHelper) {
var fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });
} }
@ -1028,7 +1047,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
require(['text!./metadataEditor.template.html'], function (template) { require(['text!./metadataEditor.template.html'], function (template) {
var dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
scrollY: false scrollY: false
}; };
@ -1039,13 +1058,13 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
dialogOptions.size = 'small'; dialogOptions.size = 'small';
} }
var dlg = dialogHelper.createDialog(dialogOptions); const dlg = dialogHelper.createDialog(dialogOptions);
dlg.classList.add('formDialog'); dlg.classList.add('formDialog');
var html = ''; let html = '';
html += globalize.translateDocument(template, 'core'); html += globalize.translateHtml(template, 'core');
dlg.innerHTML = html; dlg.innerHTML = html;
@ -1071,7 +1090,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
}); });
} }
return { export default {
show: function (itemId, serverId) { show: function (itemId, serverId) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
return show(itemId, serverId, resolve, reject); return show(itemId, serverId, resolve, reject);
@ -1085,7 +1104,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
require(['text!./metadataEditor.template.html'], function (template) { require(['text!./metadataEditor.template.html'], function (template) {
elem.innerHTML = globalize.translateDocument(template, 'core'); elem.innerHTML = globalize.translateHtml(template, 'core');
elem.querySelector('.formDialogFooter').classList.remove('formDialogFooter'); elem.querySelector('.formDialogFooter').classList.remove('formDialogFooter');
elem.querySelector('.btnHeaderSave').classList.remove('hide'); elem.querySelector('.btnHeaderSave').classList.remove('hide');
@ -1101,4 +1120,5 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
}); });
} }
}; };
});
/* eslint-enable indent */

31
src/components/metadataEditor/personEditor.js
View file

@ -1,9 +1,17 @@
define(['dialogHelper', 'layoutManager', 'globalize', 'require', 'paper-icon-button-light', 'emby-input', 'emby-select', 'css!./../formdialog'], function (dialogHelper, layoutManager, globalize, require) { import dialogHelper from 'dialogHelper';
'use strict'; import layoutManager from 'layoutManager';
import globalize from 'globalize';
import require from 'require';
import 'paper-icon-button-light';
import 'emby-input';
import 'emby-select';
import 'css!./../formdialog';
/* eslint-disable indent */
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
require(['scrollHelper'], function (scrollHelper) { require(['scrollHelper'], function (scrollHelper) {
var fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });
} }
@ -13,7 +21,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'require', 'paper-icon-but
require(['text!./personEditor.template.html'], function (template) { require(['text!./personEditor.template.html'], function (template) {
var dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
scrollY: false scrollY: false
}; };
@ -24,14 +32,14 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'require', 'paper-icon-but
dialogOptions.size = 'small'; dialogOptions.size = 'small';
} }
var dlg = dialogHelper.createDialog(dialogOptions); const dlg = dialogHelper.createDialog(dialogOptions);
dlg.classList.add('formDialog'); dlg.classList.add('formDialog');
var html = ''; let html = '';
var submitted = false; let submitted = false;
html += globalize.translateDocument(template, 'core'); html += globalize.translateHtml(template, 'core');
dlg.innerHTML = html; dlg.innerHTML = html;
@ -93,7 +101,8 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'require', 'paper-icon-but
}); });
} }
return { export default {
show: show show: show
}; };
});
/* eslint-enable indent */

12
src/components/playback/playerSelectionMenu.js
View file

@ -118,7 +118,7 @@ export function show(button) {
}); });
require(['actionsheet'], function (actionsheet) { import('actionsheet').then(({default: actionsheet}) => {
loading.hide(); loading.hide();
@ -153,8 +153,12 @@ export function show(button) {
} }
function showActivePlayerMenu(playerInfo) { function showActivePlayerMenu(playerInfo) {
Promise.all([
require(['dialogHelper', 'dialog', 'emby-checkbox', 'emby-button'], function (dialogHelper) { import('dialogHelper'),
import('dialog'),
import('emby-checkbox'),
import('emby-button')
]).then(([dialogHelper]) => {
showActivePlayerMenuInternal(dialogHelper, playerInfo); showActivePlayerMenuInternal(dialogHelper, playerInfo);
}); });
} }
@ -163,7 +167,7 @@ function disconnectFromPlayer(currentDeviceName) {
if (playbackManager.getSupportedCommands().indexOf('EndSession') !== -1) { if (playbackManager.getSupportedCommands().indexOf('EndSession') !== -1) {
require(['dialog'], function (dialog) { import('dialog').then(({default: dialog}) => {
var menuItems = []; var menuItems = [];

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

@ -302,7 +302,7 @@ import 'emby-checkbox';
return import('text!./playbackSettings.template.html').then(({default: template}) => { return import('text!./playbackSettings.template.html').then(({default: template}) => {
options.element.innerHTML = globalize.translateDocument(template, 'core'); options.element.innerHTML = globalize.translateHtml(template, 'core');
options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self)); options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self));

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

@ -1,9 +1,19 @@
define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlayManager', 'playMethodHelper', 'layoutManager', 'serverNotifications', 'paper-icon-button-light', 'css!./playerstats'], function (events, globalize, playbackManager, connectionManager, syncPlayManager, playMethodHelper, layoutManager, serverNotifications) { import events from 'events';
'use strict'; import globalize from 'globalize';
import playbackManager from 'playbackManager';
import connectionManager from 'connectionManager';
import syncPlayManager from 'syncPlayManager';
import playMethodHelper from 'playMethodHelper';
import layoutManager from 'layoutManager';
import serverNotifications from 'serverNotifications';
import 'paper-icon-button-light';
import 'css!./playerstats';
/* eslint-disable indent */
function init(instance) { function init(instance) {
var parent = document.createElement('div'); const parent = document.createElement('div');
parent.classList.add('playerStats'); parent.classList.add('playerStats');
@ -13,7 +23,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
parent.classList.add('hide'); parent.classList.add('hide');
var button; let button;
if (layoutManager.tv) { if (layoutManager.tv) {
button = ''; button = '';
@ -21,7 +31,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
button = '<button type="button" is="paper-icon-button-light" class="playerStats-closeButton"><span class="material-icons close"></span></button>'; button = '<button type="button" is="paper-icon-button-light" class="playerStats-closeButton"><span class="material-icons close"></span></button>';
} }
var contentClass = layoutManager.tv ? 'playerStats-content playerStats-content-tv' : 'playerStats-content'; const contentClass = layoutManager.tv ? 'playerStats-content playerStats-content-tv' : 'playerStats-content';
parent.innerHTML = '<div class="' + contentClass + '">' + button + '<div class="playerStats-stats"></div></div>'; parent.innerHTML = '<div class="' + contentClass + '">' + button + '<div class="playerStats-stats"></div></div>';
@ -44,9 +54,9 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
elem.querySelector('.playerStats-stats').innerHTML = categories.map(function (category) { elem.querySelector('.playerStats-stats').innerHTML = categories.map(function (category) {
var categoryHtml = ''; let categoryHtml = '';
var stats = category.stats; const stats = category.stats;
if (stats.length && category.name) { if (stats.length && category.name) {
categoryHtml += '<div class="playerStats-stat playerStats-stat-header">'; categoryHtml += '<div class="playerStats-stat playerStats-stat-header">';
@ -62,11 +72,11 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
categoryHtml += '</div>'; categoryHtml += '</div>';
} }
for (var i = 0, length = stats.length; i < length; i++) { for (let i = 0, length = stats.length; i < length; i++) {
categoryHtml += '<div class="playerStats-stat">'; categoryHtml += '<div class="playerStats-stat">';
var stat = stats[i]; const stat = stats[i];
categoryHtml += '<div class="playerStats-stat-label">'; categoryHtml += '<div class="playerStats-stat-label">';
categoryHtml += stat.label; categoryHtml += stat.label;
@ -86,13 +96,13 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
function getSession(instance, player) { function getSession(instance, player) {
var now = new Date().getTime(); const now = new Date().getTime();
if ((now - (instance.lastSessionTime || 0)) < 10000) { if ((now - (instance.lastSessionTime || 0)) < 10000) {
return Promise.resolve(instance.lastSession); return Promise.resolve(instance.lastSession);
} }
var apiClient = connectionManager.getApiClient(playbackManager.currentItem(player).ServerId); const apiClient = connectionManager.getApiClient(playbackManager.currentItem(player).ServerId);
return apiClient.getSessions({ return apiClient.getSessions({
deviceId: apiClient.deviceId() deviceId: apiClient.deviceId()
@ -114,12 +124,12 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
} }
function getTranscodingStats(session, player, displayPlayMethod) { function getTranscodingStats(session, player, displayPlayMethod) {
var sessionStats = []; const sessionStats = [];
var videoCodec; let videoCodec;
var audioCodec; let audioCodec;
var totalBitrate; let totalBitrate;
var audioChannels; let audioChannels;
if (session.TranscodingInfo) { if (session.TranscodingInfo) {
@ -208,11 +218,11 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
function getMediaSourceStats(session, player, displayPlayMethod) { function getMediaSourceStats(session, player, displayPlayMethod) {
var sessionStats = []; const sessionStats = [];
var mediaSource = playbackManager.currentMediaSource(player) || {}; const mediaSource = playbackManager.currentMediaSource(player) || {};
var totalBitrate = mediaSource.Bitrate; const totalBitrate = mediaSource.Bitrate;
var mediaFileSize = mediaSource.Size; const mediaFileSize = mediaSource.Size;
if (mediaSource.Container) { if (mediaSource.Container) {
sessionStats.push({ sessionStats.push({
@ -236,26 +246,26 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
}); });
} }
var mediaStreams = mediaSource.MediaStreams || []; const mediaStreams = mediaSource.MediaStreams || [];
var videoStream = mediaStreams.filter(function (s) { const videoStream = mediaStreams.filter(function (s) {
return s.Type === 'Video'; return s.Type === 'Video';
})[0] || {}; })[0] || {};
var videoCodec = videoStream.Codec; const videoCodec = videoStream.Codec;
var audioStreamIndex = playbackManager.getAudioStreamIndex(player); const audioStreamIndex = playbackManager.getAudioStreamIndex(player);
var audioStream = playbackManager.audioTracks(player).filter(function (s) { const audioStream = playbackManager.audioTracks(player).filter(function (s) {
return s.Type === 'Audio' && s.Index === audioStreamIndex; return s.Type === 'Audio' && s.Index === audioStreamIndex;
})[0] || {}; })[0] || {};
var audioCodec = audioStream.Codec; const audioCodec = audioStream.Codec;
var audioChannels = audioStream.Channels; const audioChannels = audioStream.Channels;
var videoInfos = []; const videoInfos = [];
if (videoCodec) { if (videoCodec) {
videoInfos.push(videoCodec.toUpperCase()); videoInfos.push(videoCodec.toUpperCase());
@ -279,7 +289,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
}); });
} }
var audioInfos = []; const audioInfos = [];
if (audioCodec) { if (audioCodec) {
audioInfos.push(audioCodec.toUpperCase()); audioInfos.push(audioCodec.toUpperCase());
@ -328,8 +338,8 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
} }
function getSyncPlayStats() { function getSyncPlayStats() {
var syncStats = []; const syncStats = [];
var stats = syncPlayManager.getStats(); const stats = syncPlayManager.getStats();
syncStats.push({ syncStats.push({
label: globalize.translate('LabelSyncPlayTimeOffset'), label: globalize.translate('LabelSyncPlayTimeOffset'),
@ -351,18 +361,18 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
function getStats(instance, player) { function getStats(instance, player) {
var statsPromise = player.getStats ? player.getStats() : Promise.resolve({}); const statsPromise = player.getStats ? player.getStats() : Promise.resolve({});
var sessionPromise = getSession(instance, player); const sessionPromise = getSession(instance, player);
return Promise.all([statsPromise, sessionPromise]).then(function (responses) { return Promise.all([statsPromise, sessionPromise]).then(function (responses) {
var playerStatsResult = responses[0]; const playerStatsResult = responses[0];
var playerStats = playerStatsResult.categories || []; const playerStats = playerStatsResult.categories || [];
var session = responses[1]; const session = responses[1];
var displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session); const displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session);
var baseCategory = { const baseCategory = {
stats: [], stats: [],
name: 'Playback Info' name: 'Playback Info'
}; };
@ -377,13 +387,13 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
value: player.name value: player.name
}); });
var categories = []; const categories = [];
categories.push(baseCategory); categories.push(baseCategory);
for (var i = 0, length = playerStats.length; i < length; i++) { for (let i = 0, length = playerStats.length; i < length; i++) {
var category = playerStats[i]; const category = playerStats[i];
if (category.type === 'audio') { if (category.type === 'audio') {
category.name = 'Audio Info'; category.name = 'Audio Info';
} else if (category.type === 'video') { } else if (category.type === 'video') {
@ -418,7 +428,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
function renderPlayerStats(instance, player) { function renderPlayerStats(instance, player) {
var now = new Date().getTime(); const now = new Date().getTime();
if ((now - (instance.lastRender || 0)) < 700) { if ((now - (instance.lastRender || 0)) < 700) {
return; return;
@ -428,7 +438,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
getStats(instance, player).then(function (stats) { getStats(instance, player).then(function (stats) {
var elem = instance.element; const elem = instance.element;
if (!elem) { if (!elem) {
return; return;
} }
@ -439,7 +449,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
function bindEvents(instance, player) { function bindEvents(instance, player) {
var localOnTimeUpdate = function () { const localOnTimeUpdate = function () {
renderPlayerStats(instance, player); renderPlayerStats(instance, player);
}; };
@ -449,14 +459,15 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
function unbindEvents(instance, player) { function unbindEvents(instance, player) {
var localOnTimeUpdate = instance.onTimeUpdate; const localOnTimeUpdate = instance.onTimeUpdate;
if (localOnTimeUpdate) { if (localOnTimeUpdate) {
events.off(player, 'timeupdate', localOnTimeUpdate); events.off(player, 'timeupdate', localOnTimeUpdate);
} }
} }
function PlayerStats(options) { class PlayerStats {
constructor(options) {
this.options = options; this.options = options;
@ -465,13 +476,13 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
this.enabled(true); this.enabled(true);
} }
PlayerStats.prototype.enabled = function (enabled) { enabled(enabled) {
if (enabled == null) { if (enabled == null) {
return this._enabled; return this._enabled;
} }
var options = this.options; const options = this.options;
if (!options) { if (!options) {
return; return;
@ -485,15 +496,15 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
this.element.classList.add('hide'); this.element.classList.add('hide');
unbindEvents(this, options.player); unbindEvents(this, options.player);
} }
}; }
PlayerStats.prototype.toggle = function () { toggle() {
this.enabled(!this.enabled()); this.enabled(!this.enabled());
}; }
PlayerStats.prototype.destroy = function () { destroy() {
var options = this.options; const options = this.options;
if (options) { if (options) {
@ -501,12 +512,14 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
unbindEvents(this, options.player); unbindEvents(this, options.player);
} }
var elem = this.element; const elem = this.element;
if (elem) { if (elem) {
elem.parentNode.removeChild(elem); elem.parentNode.removeChild(elem);
this.element = null; this.element = null;
} }
}; }
}
return PlayerStats; /* eslint-enable indent */
});
export default PlayerStats;

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

@ -156,7 +156,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
var html = ''; var html = '';
html += globalize.translateDocument(template, 'core'); html += globalize.translateHtml(template, 'core');
dlg.innerHTML = html; dlg.innerHTML = html;

2
src/components/recordingcreator/recordingeditor.js
View file

@ -116,7 +116,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
var html = ''; var html = '';
html += globalize.translateDocument(template, 'core'); html += globalize.translateHtml(template, 'core');
dlg.innerHTML = html; dlg.innerHTML = html;

2
src/components/recordingcreator/recordingfields.js
View file

@ -219,7 +219,7 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
require(['text!./recordingfields.template.html'], function (template) { require(['text!./recordingfields.template.html'], function (template) {
var options = self.options; var options = self.options;
var context = options.parent; var context = options.parent;
context.innerHTML = globalize.translateDocument(template, 'core'); context.innerHTML = globalize.translateHtml(template, 'core');
context.querySelector('.singleRecordingButton').addEventListener('click', onRecordChange.bind(self)); context.querySelector('.singleRecordingButton').addEventListener('click', onRecordChange.bind(self));
context.querySelector('.seriesRecordingButton').addEventListener('click', onRecordSeriesChange.bind(self)); context.querySelector('.seriesRecordingButton').addEventListener('click', onRecordSeriesChange.bind(self));

4
src/components/recordingcreator/seriesrecordingeditor.js
View file

@ -168,7 +168,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
var dlg = options.context; var dlg = options.context;
dlg.classList.add('hide'); dlg.classList.add('hide');
dlg.innerHTML = globalize.translateDocument(template, 'core'); dlg.innerHTML = globalize.translateHtml(template, 'core');
dlg.querySelector('.formDialogHeader').classList.add('hide'); dlg.querySelector('.formDialogHeader').classList.add('hide');
dlg.querySelector('.formDialogFooter').classList.add('hide'); dlg.querySelector('.formDialogFooter').classList.add('hide');
@ -221,7 +221,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
var html = ''; var html = '';
html += globalize.translateDocument(template, 'core'); html += globalize.translateHtml(template, 'core');
dlg.innerHTML = html; dlg.innerHTML = html;

4
src/components/search/searchfields.js
View file

@ -70,9 +70,9 @@ import 'css!./searchfields';
function embed(elem, instance, options) { function embed(elem, instance, options) {
require(['text!./searchfields.template.html'], function (template) { import('text!./searchfields.template.html').then(({default: template}) => {
let html = globalize.translateDocument(template, 'core'); let html = globalize.translateHtml(template, 'core');
if (browser.tizen || browser.orsay) { if (browser.tizen || browser.orsay) {
html = html.replace('<input ', '<input readonly '); html = html.replace('<input ', '<input readonly ');

4
src/components/search/searchresults.js
View file

@ -604,14 +604,14 @@ import 'emby-button';
function embed(elem, instance, options) { function embed(elem, instance, options) {
require(['text!./searchresults.template.html'], function (template) { import('text!./searchresults.template.html').then(({default: template}) => {
if (!enableScrollX()) { if (!enableScrollX()) {
template = replaceAll(template, 'data-horizontal="true"', 'data-horizontal="false"'); template = replaceAll(template, 'data-horizontal="true"', 'data-horizontal="false"');
template = replaceAll(template, 'itemsContainer scrollSlider', 'itemsContainer scrollSlider vertical-wrap'); template = replaceAll(template, 'itemsContainer scrollSlider', 'itemsContainer scrollSlider vertical-wrap');
} }
const html = globalize.translateDocument(template, 'core'); const html = globalize.translateHtml(template, 'core');
elem.innerHTML = html; elem.innerHTML = html;

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

@ -73,7 +73,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana
html += template; html += template;
dlg.innerHTML = globalize.translateDocument(html, 'core'); dlg.innerHTML = globalize.translateHtml(html, 'core');
fillSortBy(dlg, options.sortOptions); fillSortBy(dlg, options.sortOptions);
initEditor(dlg, options.settings); initEditor(dlg, options.settings);

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

@ -448,7 +448,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
dlg.classList.add('formDialog'); dlg.classList.add('formDialog');
dlg.classList.add('subtitleEditorDialog'); dlg.classList.add('subtitleEditorDialog');
dlg.innerHTML = globalize.translateDocument(template, 'core'); dlg.innerHTML = globalize.translateHtml(template, 'core');
dlg.querySelector('.originalSubtitleFileLabel').innerHTML = globalize.translate('File'); dlg.querySelector('.originalSubtitleFileLabel').innerHTML = globalize.translate('File');

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

@ -90,7 +90,7 @@ function save(instance, context, userId, userSettings, apiClient, enableSaveConf
loading.hide(); loading.hide();
if (enableSaveConfirmation) { if (enableSaveConfirmation) {
require(['toast'], function (toast) { import('toast').then(({default: toast}) => {
toast(globalize.translate('SettingsSaved')); toast(globalize.translate('SettingsSaved'));
}); });
} }
@ -130,10 +130,10 @@ function onAppearanceFieldChange(e) {
function embed(options, self) { function embed(options, self) {
require(['text!./subtitlesettings.template.html'], function (template) { import('text!./subtitlesettings.template.html').then(({default: template}) => {
options.element.classList.add('subtitlesettings'); options.element.classList.add('subtitlesettings');
options.element.innerHTML = globalize.translateDocument(template, 'core'); options.element.innerHTML = globalize.translateHtml(template, 'core');
options.element.querySelector('form').addEventListener('submit', self.onSubmit.bind(self)); options.element.querySelector('form').addEventListener('submit', self.onSubmit.bind(self));

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

@ -84,7 +84,7 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
html += template; html += template;
dlg.innerHTML = globalize.translateDocument(html, 'core'); dlg.innerHTML = globalize.translateHtml(html, 'core');
var settingElements = dlg.querySelectorAll('.viewSetting'); var settingElements = dlg.querySelectorAll('.viewSetting');
for (var i = 0, length = settingElements.length; i < length; i++) { for (var i = 0, length = settingElements.length; i < length; i++) {

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

@ -380,6 +380,7 @@ import 'emby-itemrefreshindicator';
}); });
pageIdOn('pageshow', 'mediaLibraryPage', function () { pageIdOn('pageshow', 'mediaLibraryPage', function () {
libraryMenu.setTabs('librarysetup', 0, getTabs); libraryMenu.setTabs('librarysetup', 0, getTabs);
const page = this; const page = this;
taskButton({ taskButton({
mode: 'on', mode: 'on',
@ -389,6 +390,7 @@ import 'emby-itemrefreshindicator';
}); });
}); });
pageIdOn('pagebeforehide', 'mediaLibraryPage', function () { pageIdOn('pagebeforehide', 'mediaLibraryPage', function () {
const page = this; const page = this;
taskButton({ taskButton({
mode: 'off', mode: 'off',

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

@ -43,7 +43,7 @@ import 'emby-select';
$('.taskName', view).html(task.Name); $('.taskName', view).html(task.Name);
$('#pTaskDescription', view).html(task.Description); $('#pTaskDescription', view).html(task.Description);
require(['listViewStyle'], function () { import('listViewStyle').then(() => {
ScheduledTaskPage.loadTaskTriggers(view, task); ScheduledTaskPage.loadTaskTriggers(view, task);
}); });
@ -137,7 +137,7 @@ import 'emby-select';
$('#popupAddTrigger', view).removeClass('hide'); $('#popupAddTrigger', view).removeClass('hide');
}, },
confirmDeleteTrigger: function (view, index) { confirmDeleteTrigger: function (view, index) {
require(['confirm'], function (confirm) { import('confirm').then(({default: confirm}) => {
confirm.default(globalize.translate('MessageDeleteTaskTrigger'), globalize.translate('HeaderDeleteTaskTrigger')).then(function () { confirm.default(globalize.translate('MessageDeleteTaskTrigger'), globalize.translate('HeaderDeleteTaskTrigger')).then(function () {
ScheduledTaskPage.deleteTrigger(view, index); ScheduledTaskPage.deleteTrigger(view, index);
}); });

2
src/controllers/livetvguideprovider.js
View file

@ -17,7 +17,7 @@ define(['events', 'loading', 'globalize'], function (events, loading, globalize)
function loadTemplate(page, type, providerId) { function loadTemplate(page, type, providerId) {
require(['text!./components/tvproviders/' + type + '.template.html'], function (html) { require(['text!./components/tvproviders/' + type + '.template.html'], function (html) {
page.querySelector('.providerTemplate').innerHTML = globalize.translateDocument(html); page.querySelector('.providerTemplate').innerHTML = globalize.translateHtml(html);
init(page, type, providerId); init(page, type, providerId);
}); });
} }

4
src/controllers/livetvstatus.js
View file

@ -303,7 +303,7 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo
}).on('pageshow', '#liveTvStatusPage', function () { }).on('pageshow', '#liveTvStatusPage', function () {
var page = this; var page = this;
reload(page); reload(page);
taskButton({ taskButton.default({
mode: 'on', mode: 'on',
progressElem: page.querySelector('.refreshGuideProgress'), progressElem: page.querySelector('.refreshGuideProgress'),
taskKey: 'RefreshGuide', taskKey: 'RefreshGuide',
@ -311,7 +311,7 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo
}); });
}).on('pagehide', '#liveTvStatusPage', function () { }).on('pagehide', '#liveTvStatusPage', function () {
var page = this; var page = this;
taskButton({ taskButton.default({
mode: 'off', mode: 'off',
progressElem: page.querySelector('.refreshGuideProgress'), progressElem: page.querySelector('.refreshGuideProgress'),
taskKey: 'RefreshGuide', taskKey: 'RefreshGuide',

4
src/controllers/playback/videoosd.js
View file

@ -964,7 +964,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
if (statsOverlay) { if (statsOverlay) {
statsOverlay.toggle(); statsOverlay.toggle();
} else { } else {
statsOverlay = new PlayerStats({ statsOverlay = new PlayerStats.default({
player: player player: player
}); });
} }
@ -1533,7 +1533,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
if (browser.touch) { if (browser.touch) {
(function () { (function () {
require(['touchHelper'], function (TouchHelper) { require(['touchHelper'], function (TouchHelper) {
self.touchHelper = new TouchHelper(view, { self.touchHelper = new TouchHelper.default(view, {
swipeYThreshold: 30, swipeYThreshold: 30,
triggerOnMove: true, triggerOnMove: true,
preventDefaultOnMove: true, preventDefaultOnMove: true,

24
src/controllers/user/menu.js
View file

@ -1,8 +1,11 @@
define(['apphost', 'connectionManager', 'layoutManager', 'listViewStyle', 'emby-button'], function(appHost, connectionManager, layoutManager) { import appHost from 'apphost';
'use strict'; import connectionManager from 'connectionManager';
import layoutManager from 'layoutManager';
import 'listViewStyle';
import 'emby-button';
return function(view, params) { export default function (view, params) {
view.querySelector('.btnLogout').addEventListener('click', function() { view.querySelector('.btnLogout').addEventListener('click', function () {
Dashboard.logout(); Dashboard.logout();
}); });
@ -14,10 +17,10 @@ define(['apphost', 'connectionManager', 'layoutManager', 'listViewStyle', 'emby-
window.NativeShell.openClientSettings(); window.NativeShell.openClientSettings();
}); });
view.addEventListener('viewshow', function() { view.addEventListener('viewshow', function () {
// this page can also be used by admins to change user preferences from the user edit page // this page can also be used by admins to change user preferences from the user edit page
var userId = params.userId || Dashboard.getCurrentUserId(); const userId = params.userId || Dashboard.getCurrentUserId();
var page = this; const page = this;
page.querySelector('.lnkMyProfile').setAttribute('href', 'myprofile.html?userId=' + userId); page.querySelector('.lnkMyProfile').setAttribute('href', 'myprofile.html?userId=' + userId);
page.querySelector('.lnkDisplayPreferences').setAttribute('href', 'mypreferencesdisplay.html?userId=' + userId); page.querySelector('.lnkDisplayPreferences').setAttribute('href', 'mypreferencesdisplay.html?userId=' + userId);
@ -43,16 +46,15 @@ define(['apphost', 'connectionManager', 'layoutManager', 'listViewStyle', 'emby-
page.querySelector('.adminSection').classList.add('hide'); page.querySelector('.adminSection').classList.add('hide');
} }
ApiClient.getUser(userId).then(function(user) { ApiClient.getUser(userId).then(function (user) {
page.querySelector('.headerUsername').innerHTML = user.Name; page.querySelector('.headerUsername').innerHTML = user.Name;
if (!user.Policy.IsAdministrator) { if (!user.Policy.IsAdministrator) {
page.querySelector('.adminSection').classList.add('hide'); page.querySelector('.adminSection').classList.add('hide');
} }
}); });
require(['autoFocuser'], function (autoFocuser) { import('autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(view); autoFocuser.autoFocus(view);
}); });
}); });
}; }
});

55
src/controllers/user/profile.js
View file

@ -1,14 +1,18 @@
define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu', 'apphost', 'globalize', 'emby-button'], function (UserPasswordPage, loading, libraryMenu, appHost, globalize) { import UserPasswordPage from 'controllers/dashboard/users/userpasswordpage';
'use strict'; import loading from 'loading';
import libraryMenu from 'libraryMenu';
import appHost from 'apphost';
import globalize from 'globalize';
import 'emby-button';
function reloadUser(page) { function reloadUser(page) {
var userId = getParameterByName('userId'); const userId = getParameterByName('userId');
loading.show(); loading.show();
ApiClient.getUser(userId).then(function (user) { ApiClient.getUser(userId).then(function (user) {
page.querySelector('.username').innerHTML = user.Name; page.querySelector('.username').innerHTML = user.Name;
libraryMenu.setTitle(user.Name); libraryMenu.setTitle(user.Name);
var imageUrl = 'assets/img/avatar.png'; let imageUrl = 'assets/img/avatar.png';
if (user.PrimaryImageTag) { if (user.PrimaryImageTag) {
imageUrl = ApiClient.getUserImageUrl(user.Id, { imageUrl = ApiClient.getUserImageUrl(user.Id, {
tag: user.PrimaryImageTag, tag: user.PrimaryImageTag,
@ -16,7 +20,7 @@ define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu'
}); });
} }
var userImage = page.querySelector('#image'); const userImage = page.querySelector('#image');
userImage.style.backgroundImage = 'url(' + imageUrl + ')'; userImage.style.backgroundImage = 'url(' + imageUrl + ')';
Dashboard.getCurrentUser().then(function (loggedInUser) { Dashboard.getCurrentUser().then(function (loggedInUser) {
@ -30,13 +34,13 @@ define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu'
}); });
loading.hide(); loading.hide();
}); });
} }
function onFileReaderError(evt) { function onFileReaderError(evt) {
loading.hide(); loading.hide();
switch (evt.target.error.code) { switch (evt.target.error.code) {
case evt.target.error.NOT_FOUND_ERR: case evt.target.error.NOT_FOUND_ERR:
require(['toast'], function (toast) { import('toast').then(({default: toast}) => {
toast(globalize.translate('FileNotFound')); toast(globalize.translate('FileNotFound'));
}); });
break; break;
@ -45,33 +49,33 @@ define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu'
break; break;
case evt.target.error.NOT_READABLE_ERR: case evt.target.error.NOT_READABLE_ERR:
default: default:
require(['toast'], function (toast) { import('toast').then(({default: toast}) => {
toast(globalize.translate('FileReadError')); toast(globalize.translate('FileReadError'));
}); });
} }
} }
function onFileReaderAbort(evt) { function onFileReaderAbort(evt) {
loading.hide(); loading.hide();
require(['toast'], function (toast) { import('toast').then(({default: toast}) => {
toast(globalize.translate('FileReadCancelled')); toast(globalize.translate('FileReadCancelled'));
}); });
} }
function setFiles(page, files) { function setFiles(page, files) {
var userImage = page.querySelector('#image'); const userImage = page.querySelector('#image');
var file = files[0]; const file = files[0];
if (!file || !file.type.match('image.*')) { if (!file || !file.type.match('image.*')) {
return false; return false;
} }
var reader = new FileReader(); const reader = new FileReader();
reader.onerror = onFileReaderError; reader.onerror = onFileReaderError;
reader.onabort = onFileReaderAbort; reader.onabort = onFileReaderAbort;
reader.onload = function (evt) { reader.onload = function (evt) {
userImage.style.backgroundImage = 'url(' + evt.target.result + ')'; userImage.style.backgroundImage = 'url(' + evt.target.result + ')';
var userId = getParameterByName('userId'); const userId = getParameterByName('userId');
ApiClient.uploadUserImage(userId, 'Primary', file).then(function () { ApiClient.uploadUserImage(userId, 'Primary', file).then(function () {
loading.hide(); loading.hide();
reloadUser(page); reloadUser(page);
@ -79,16 +83,16 @@ define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu'
}; };
reader.readAsDataURL(file); reader.readAsDataURL(file);
} }
return function (view, params) { export default function (view, params) {
reloadUser(view); reloadUser(view);
new UserPasswordPage(view, params); new UserPasswordPage(view, params);
view.querySelector('#btnDeleteImage').addEventListener('click', function () { view.querySelector('#btnDeleteImage').addEventListener('click', function () {
require(['confirm'], function (confirm) { import('confirm').then(({default: confirm}) => {
confirm.default(globalize.translate('DeleteImageConfirmation'), globalize.translate('DeleteImage')).then(function () { confirm(globalize.translate('DeleteImageConfirmation'), globalize.translate('DeleteImage')).then(function () {
loading.show(); loading.show();
var userId = getParameterByName('userId'); const userId = getParameterByName('userId');
ApiClient.deleteUserImage(userId, 'primary').then(function () { ApiClient.deleteUserImage(userId, 'primary').then(function () {
loading.hide(); loading.hide();
reloadUser(view); reloadUser(view);
@ -102,5 +106,4 @@ define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu'
view.querySelector('#uploadImage').addEventListener('change', function (evt) { view.querySelector('#uploadImage').addEventListener('change', function (evt) {
setFiles(view, evt.target.files); setFiles(view, evt.target.files);
}); });
}; }
});

12
src/controllers/wizard/finish.js
View file

@ -1,7 +1,6 @@
define(['loading'], function (loading) { import loading from 'loading';
'use strict';
function onFinish() { function onFinish() {
loading.show(); loading.show();
ApiClient.ajax({ ApiClient.ajax({
url: ApiClient.getUrl('Startup/Complete'), url: ApiClient.getUrl('Startup/Complete'),
@ -10,9 +9,8 @@ define(['loading'], function (loading) {
loading.hide(); loading.hide();
window.location.href = 'index.html'; window.location.href = 'index.html';
}); });
} }
return function (view, params) { export default function (view, params) {
view.querySelector('.btnWizardNext').addEventListener('click', onFinish); view.querySelector('.btnWizardNext').addEventListener('click', onFinish);
}; }
});

27
src/controllers/wizard/remoteaccess.js
View file

@ -1,10 +1,12 @@
define(['loading', 'emby-checkbox', 'emby-button', 'emby-select'], function (loading) { import loading from 'loading';
'use strict'; import 'emby-checkbox';
import 'emby-button';
import 'emby-select';
function save(page) { function save(page) {
loading.show(); loading.show();
var apiClient = ApiClient; const apiClient = ApiClient;
var config = {}; const config = {};
config.EnableRemoteAccess = page.querySelector('#chkRemoteAccess').checked; config.EnableRemoteAccess = page.querySelector('#chkRemoteAccess').checked;
config.EnableAutomaticPortMapping = page.querySelector('#chkEnableUpnp').checked; config.EnableAutomaticPortMapping = page.querySelector('#chkEnableUpnp').checked;
apiClient.ajax({ apiClient.ajax({
@ -15,19 +17,19 @@ define(['loading', 'emby-checkbox', 'emby-button', 'emby-select'], function (loa
loading.hide(); loading.hide();
navigateToNextPage(); navigateToNextPage();
}); });
} }
function navigateToNextPage() { function navigateToNextPage() {
Dashboard.navigate('wizardfinish.html'); Dashboard.navigate('wizardfinish.html');
} }
function onSubmit(e) { function onSubmit(e) {
save(this); save(this);
e.preventDefault(); e.preventDefault();
return false; return false;
} }
return function (view, params) { export default function (view, params) {
view.querySelector('.wizardSettingsForm').addEventListener('submit', onSubmit); view.querySelector('.wizardSettingsForm').addEventListener('submit', onSubmit);
view.addEventListener('viewshow', function () { view.addEventListener('viewshow', function () {
document.querySelector('.skinHeader').classList.add('noHomeButtonHeader'); document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
@ -35,5 +37,4 @@ define(['loading', 'emby-checkbox', 'emby-button', 'emby-select'], function (loa
view.addEventListener('viewhide', function () { view.addEventListener('viewhide', function () {
document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader'); document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
}); });
}; }
});

61
src/controllers/wizard/settings.js
View file

@ -1,9 +1,11 @@
define(['loading', 'emby-checkbox', 'emby-button', 'emby-select'], function (loading) { import loading from 'loading';
'use strict'; import 'emby-checkbox';
import 'emby-button';
import 'emby-select';
function save(page) { function save(page) {
loading.show(); loading.show();
var apiClient = ApiClient; const apiClient = ApiClient;
apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).then(function (config) { apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).then(function (config) {
config.PreferredMetadataLanguage = page.querySelector('#selectLanguage').value; config.PreferredMetadataLanguage = page.querySelector('#selectLanguage').value;
config.MetadataCountryCode = page.querySelector('#selectCountry').value; config.MetadataCountryCode = page.querySelector('#selectCountry').value;
@ -16,62 +18,62 @@ define(['loading', 'emby-checkbox', 'emby-button', 'emby-select'], function (loa
navigateToNextPage(); navigateToNextPage();
}); });
}); });
} }
function populateLanguages(select, languages) { function populateLanguages(select, languages) {
var html = ''; let html = '';
html += "<option value=''></option>"; html += "<option value=''></option>";
for (var i = 0, length = languages.length; i < length; i++) { for (let i = 0, length = languages.length; i < length; i++) {
var culture = languages[i]; const culture = languages[i];
html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + '</option>'; html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + '</option>';
} }
select.innerHTML = html; select.innerHTML = html;
} }
function populateCountries(select, allCountries) { function populateCountries(select, allCountries) {
var html = ''; let html = '';
html += "<option value=''></option>"; html += "<option value=''></option>";
for (var i = 0, length = allCountries.length; i < length; i++) { for (let i = 0, length = allCountries.length; i < length; i++) {
var culture = allCountries[i]; const culture = allCountries[i];
html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + '</option>'; html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + '</option>';
} }
select.innerHTML = html; select.innerHTML = html;
} }
function reloadData(page, config, cultures, countries) { function reloadData(page, config, cultures, countries) {
populateLanguages(page.querySelector('#selectLanguage'), cultures); populateLanguages(page.querySelector('#selectLanguage'), cultures);
populateCountries(page.querySelector('#selectCountry'), countries); populateCountries(page.querySelector('#selectCountry'), countries);
page.querySelector('#selectLanguage').value = config.PreferredMetadataLanguage; page.querySelector('#selectLanguage').value = config.PreferredMetadataLanguage;
page.querySelector('#selectCountry').value = config.MetadataCountryCode; page.querySelector('#selectCountry').value = config.MetadataCountryCode;
loading.hide(); loading.hide();
} }
function reload(page) { function reload(page) {
loading.show(); loading.show();
var apiClient = ApiClient; const apiClient = ApiClient;
var promise1 = apiClient.getJSON(apiClient.getUrl('Startup/Configuration')); const promise1 = apiClient.getJSON(apiClient.getUrl('Startup/Configuration'));
var promise2 = apiClient.getCultures(); const promise2 = apiClient.getCultures();
var promise3 = apiClient.getCountries(); const promise3 = apiClient.getCountries();
Promise.all([promise1, promise2, promise3]).then(function (responses) { Promise.all([promise1, promise2, promise3]).then(function (responses) {
reloadData(page, responses[0], responses[1], responses[2]); reloadData(page, responses[0], responses[1], responses[2]);
}); });
} }
function navigateToNextPage() { function navigateToNextPage() {
Dashboard.navigate('wizardremoteaccess.html'); Dashboard.navigate('wizardremoteaccess.html');
} }
function onSubmit(e) { function onSubmit(e) {
save(this); save(this);
e.preventDefault(); e.preventDefault();
return false; return false;
} }
return function (view, params) { export default function (view, params) {
view.querySelector('.wizardSettingsForm').addEventListener('submit', onSubmit); view.querySelector('.wizardSettingsForm').addEventListener('submit', onSubmit);
view.addEventListener('viewshow', function () { view.addEventListener('viewshow', function () {
document.querySelector('.skinHeader').classList.add('noHomeButtonHeader'); document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
@ -80,5 +82,4 @@ define(['loading', 'emby-checkbox', 'emby-button', 'emby-select'], function (loa
view.addEventListener('viewhide', function () { view.addEventListener('viewhide', function () {
document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader'); document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
}); });
}; }
});

33
src/controllers/wizard/start.js
View file

@ -1,16 +1,18 @@
define(['jQuery', 'loading', 'emby-button', 'emby-select'], function ($, loading) { import $ from 'jQuery';
'use strict'; import loading from 'loading';
import 'emby-button';
import 'emby-select';
function loadPage(page, config, languageOptions) { function loadPage(page, config, languageOptions) {
$('#selectLocalizationLanguage', page).html(languageOptions.map(function (l) { $('#selectLocalizationLanguage', page).html(languageOptions.map(function (l) {
return '<option value="' + l.Value + '">' + l.Name + '</option>'; return '<option value="' + l.Value + '">' + l.Name + '</option>';
})).val(config.UICulture); })).val(config.UICulture);
loading.hide(); loading.hide();
} }
function save(page) { function save(page) {
loading.show(); loading.show();
var apiClient = ApiClient; const apiClient = ApiClient;
apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).then(function (config) { apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).then(function (config) {
config.UICulture = $('#selectLocalizationLanguage', page).val(); config.UICulture = $('#selectLocalizationLanguage', page).val();
apiClient.ajax({ apiClient.ajax({
@ -21,22 +23,22 @@ define(['jQuery', 'loading', 'emby-button', 'emby-select'], function ($, loading
Dashboard.navigate('wizarduser.html'); Dashboard.navigate('wizarduser.html');
}); });
}); });
} }
function onSubmit() { function onSubmit() {
save($(this).parents('.page')); save($(this).parents('.page'));
return false; return false;
} }
return function (view, params) { export default function (view, params) {
$('.wizardStartForm', view).on('submit', onSubmit); $('.wizardStartForm', view).on('submit', onSubmit);
view.addEventListener('viewshow', function () { view.addEventListener('viewshow', function () {
document.querySelector('.skinHeader').classList.add('noHomeButtonHeader'); document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
loading.show(); loading.show();
var page = this; const page = this;
var apiClient = ApiClient; const apiClient = ApiClient;
var promise1 = apiClient.getJSON(apiClient.getUrl('Startup/Configuration')); const promise1 = apiClient.getJSON(apiClient.getUrl('Startup/Configuration'));
var promise2 = apiClient.getJSON(apiClient.getUrl('Localization/Options')); const promise2 = apiClient.getJSON(apiClient.getUrl('Localization/Options'));
Promise.all([promise1, promise2]).then(function (responses) { Promise.all([promise1, promise2]).then(function (responses) {
loadPage(page, responses[0], responses[1]); loadPage(page, responses[0], responses[1]);
}); });
@ -44,5 +46,4 @@ define(['jQuery', 'loading', 'emby-button', 'emby-select'], function ($, loading
view.addEventListener('viewhide', function () { view.addEventListener('viewhide', function () {
document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader'); document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
}); });
}; }
});

46
src/controllers/wizard/user.js
View file

@ -1,23 +1,26 @@
define(['loading', 'globalize', 'dashboardcss', 'emby-input', 'emby-button', 'emby-button'], function (loading, globalize) { import loading from 'loading';
'use strict'; import globalize from 'globalize';
import 'dashboardcss';
import 'emby-input';
import 'emby-button';
function getApiClient() { function getApiClient() {
return ApiClient; return ApiClient;
} }
function nextWizardPage() { function nextWizardPage() {
Dashboard.navigate('wizardlibrary.html'); Dashboard.navigate('wizardlibrary.html');
} }
function onUpdateUserComplete(result) { function onUpdateUserComplete(result) {
console.debug('user update complete: ' + result); console.debug('user update complete: ' + result);
loading.hide(); loading.hide();
nextWizardPage(); nextWizardPage();
} }
function submit(form) { function submit(form) {
loading.show(); loading.show();
var apiClient = getApiClient(); const apiClient = getApiClient();
apiClient.ajax({ apiClient.ajax({
type: 'POST', type: 'POST',
data: { data: {
@ -26,13 +29,13 @@ define(['loading', 'globalize', 'dashboardcss', 'emby-input', 'emby-button', 'em
}, },
url: apiClient.getUrl('Startup/User') url: apiClient.getUrl('Startup/User')
}).then(onUpdateUserComplete); }).then(onUpdateUserComplete);
} }
function onSubmit(e) { function onSubmit(e) {
var form = this; const form = this;
if (form.querySelector('#txtManualPassword').value != form.querySelector('#txtPasswordConfirm').value) { if (form.querySelector('#txtManualPassword').value != form.querySelector('#txtPasswordConfirm').value) {
require(['toast'], function (toast) { import('toast').then(({default: toast}) => {
toast(globalize.translate('PasswordMatchError')); toast(globalize.translate('PasswordMatchError'));
}); });
} else { } else {
@ -41,20 +44,20 @@ define(['loading', 'globalize', 'dashboardcss', 'emby-input', 'emby-button', 'em
e.preventDefault(); e.preventDefault();
return false; return false;
} }
function onViewShow() { function onViewShow() {
loading.show(); loading.show();
var page = this; const page = this;
var apiClient = getApiClient(); const apiClient = getApiClient();
apiClient.getJSON(apiClient.getUrl('Startup/User')).then(function (user) { apiClient.getJSON(apiClient.getUrl('Startup/User')).then(function (user) {
page.querySelector('#txtUsername').value = user.Name || ''; page.querySelector('#txtUsername').value = user.Name || '';
page.querySelector('#txtManualPassword').value = user.Password || ''; page.querySelector('#txtManualPassword').value = user.Password || '';
loading.hide(); loading.hide();
}); });
} }
return function (view, params) { export default function (view, params) {
view.querySelector('.wizardUserForm').addEventListener('submit', onSubmit); view.querySelector('.wizardUserForm').addEventListener('submit', onSubmit);
view.addEventListener('viewshow', function () { view.addEventListener('viewshow', function () {
document.querySelector('.skinHeader').classList.add('noHomeButtonHeader'); document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
@ -63,5 +66,4 @@ define(['loading', 'globalize', 'dashboardcss', 'emby-input', 'emby-button', 'em
document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader'); document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
}); });
view.addEventListener('viewshow', onViewShow); view.addEventListener('viewshow', onViewShow);
}; }
});

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

@ -11,7 +11,7 @@ import 'webcomponents';
this.classList.add('progressring'); this.classList.add('progressring');
const instance = this; const instance = this;
require(['text!./emby-progressring.template.html'], function (template) { import('text!./emby-progressring.template.html').then(({default: template}) => {
instance.innerHTML = template; instance.innerHTML = template;
//if (window.MutationObserver) { //if (window.MutationObserver) {

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

@ -156,7 +156,7 @@ import 'css!./emby-scroller';
}; };
function loadScrollButtons(scroller) { function loadScrollButtons(scroller) {
require(['emby-scrollbuttons'], function () { import('emby-scrollbuttons').then(() => {
scroller.insertAdjacentHTML('beforebegin', '<div is="emby-scrollbuttons" class="emby-scrollbuttons padded-right"></div>'); scroller.insertAdjacentHTML('beforebegin', '<div is="emby-scrollbuttons" class="emby-scrollbuttons padded-right"></div>');
}); });
} }

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

@ -220,7 +220,7 @@ export class BookPlayer {
let apiClient = connectionManager.getApiClient(serverId); let apiClient = connectionManager.getApiClient(serverId);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
require(['epubjs'], (epubjs) => { import('epubjs').then(({default: epubjs}) => {
let downloadHref = apiClient.getItemDownloadUrl(item.Id); let downloadHref = apiClient.getItemDownloadUrl(item.Id);
let book = epubjs.default(downloadHref, {openAs: 'epub'}); let book = epubjs.default(downloadHref, {openAs: 'epub'});
let rendition = book.renderTo(elem, {width: '100%', height: '97%'}); let rendition = book.renderTo(elem, {width: '100%', height: '97%'});

2
src/scripts/deleteHelper.js
View file

@ -7,7 +7,7 @@ function alertText(options) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
require(['alert'], function (alert) { import('alert').then(({default: alert}) => {
alert(options).then(resolve, resolve); alert(options).then(resolve, resolve);
}); });
}); });

15
src/scripts/editorsidebar.js
View file

@ -1,5 +1,9 @@
define(['datetime', 'jQuery', 'globalize', 'material-icons'], function (datetime, $, globalize) { import datetime from 'datetime';
'use strict'; import $ from 'jQuery';
import globalize from 'globalize';
import 'material-icons';
/* eslint-disable indent */
function getNode(item, folderState, selected) { function getNode(item, folderState, selected) {
var htmlName = getNodeInnerHtml(item); var htmlName = getNodeInnerHtml(item);
@ -179,7 +183,7 @@ define(['datetime', 'jQuery', 'globalize', 'material-icons'], function (datetime
} }
function initializeTree(page, currentUser, openItems, selectedId) { function initializeTree(page, currentUser, openItems, selectedId) {
require(['jstree'], function () { import('jstree').then(() => {
initializeTreeInternal(page, currentUser, openItems, selectedId); initializeTreeInternal(page, currentUser, openItems, selectedId);
}); });
} }
@ -299,7 +303,7 @@ define(['datetime', 'jQuery', 'globalize', 'material-icons'], function (datetime
$(document).on('itemsaved', '.metadataEditorPage', function (e, item) { $(document).on('itemsaved', '.metadataEditorPage', function (e, item) {
updateEditorNode(this, item); updateEditorNode(this, item);
}).on('pagebeforeshow', '.metadataEditorPage', function () { }).on('pagebeforeshow', '.metadataEditorPage', function () {
require(['css!assets/css/metadataeditor.css']); import('css!assets/css/metadataeditor.css');
}).on('pagebeforeshow', '.metadataEditorPage', function () { }).on('pagebeforeshow', '.metadataEditorPage', function () {
var page = this; var page = this;
Dashboard.getCurrentUser().then(function (user) { Dashboard.getCurrentUser().then(function (user) {
@ -331,4 +335,5 @@ define(['datetime', 'jQuery', 'globalize', 'material-icons'], function (datetime
getCurrentItemId: getCurrentItemId, getCurrentItemId: getCurrentItemId,
setCurrentItemId: setCurrentItemId setCurrentItemId: setCurrentItemId
}; };
});
/* eslint-enable indent */

106
src/scripts/globalize.js
View file

@ -1,21 +1,24 @@
define(['userSettings', 'events'], function (userSettings, events) { import * as userSettings from 'userSettings';
'use strict'; import events from 'events';
var fallbackCulture = 'en-us';
var allTranslations = {}; /* eslint-disable indent */
var currentCulture;
var currentDateTimeCulture;
function getCurrentLocale() { const fallbackCulture = 'en-us';
const allTranslations = {};
let currentCulture;
let currentDateTimeCulture;
export function getCurrentLocale() {
return currentCulture; return currentCulture;
} }
function getCurrentDateTimeLocale() { export function getCurrentDateTimeLocale() {
return currentDateTimeCulture; return currentDateTimeCulture;
} }
function getDefaultLanguage() { function getDefaultLanguage() {
var culture = document.documentElement.getAttribute('data-culture'); const culture = document.documentElement.getAttribute('data-culture');
if (culture) { if (culture) {
return culture; return culture;
} }
@ -33,8 +36,8 @@ define(['userSettings', 'events'], function (userSettings, events) {
return fallbackCulture; return fallbackCulture;
} }
function updateCurrentCulture() { export function updateCurrentCulture() {
var culture; let culture;
try { try {
culture = userSettings.language(); culture = userSettings.language();
} catch (err) { } catch (err) {
@ -44,7 +47,7 @@ define(['userSettings', 'events'], function (userSettings, events) {
currentCulture = normalizeLocaleName(culture); currentCulture = normalizeLocaleName(culture);
var dateTimeCulture; let dateTimeCulture;
try { try {
dateTimeCulture = userSettings.dateTimeLocale(); dateTimeCulture = userSettings.dateTimeLocale();
} catch (err) { } catch (err) {
@ -60,11 +63,11 @@ define(['userSettings', 'events'], function (userSettings, events) {
} }
function ensureTranslations(culture) { function ensureTranslations(culture) {
for (var i in allTranslations) { for (let i in allTranslations) {
ensureTranslation(allTranslations[i], culture); ensureTranslation(allTranslations[i], culture);
} }
if (culture !== fallbackCulture) { if (culture !== fallbackCulture) {
for (var i in allTranslations) { for (let i in allTranslations) {
ensureTranslation(allTranslations[i], fallbackCulture); ensureTranslation(allTranslations[i], fallbackCulture);
} }
} }
@ -85,14 +88,14 @@ define(['userSettings', 'events'], function (userSettings, events) {
culture = culture.replace('_', '-'); culture = culture.replace('_', '-');
// convert de-DE to de // convert de-DE to de
var parts = culture.split('-'); const parts = culture.split('-');
if (parts.length === 2) { if (parts.length === 2) {
if (parts[0].toLowerCase() === parts[1].toLowerCase()) { if (parts[0].toLowerCase() === parts[1].toLowerCase()) {
culture = parts[0].toLowerCase(); culture = parts[0].toLowerCase();
} }
} }
var lower = culture.toLowerCase(); const lower = culture.toLowerCase();
if (lower === 'ca-es') { if (lower === 'ca-es') {
return 'ca'; return 'ca';
} }
@ -110,7 +113,7 @@ define(['userSettings', 'events'], function (userSettings, events) {
module = defaultModule(); module = defaultModule();
} }
var translations = allTranslations[module]; const translations = allTranslations[module];
if (!translations) { if (!translations) {
return {}; return {};
} }
@ -118,17 +121,17 @@ define(['userSettings', 'events'], function (userSettings, events) {
return translations.dictionaries[locale]; return translations.dictionaries[locale];
} }
function register(options) { export function register(options) {
allTranslations[options.name] = { allTranslations[options.name] = {
translations: options.strings || options.translations, translations: options.strings || options.translations,
dictionaries: {} dictionaries: {}
}; };
} }
function loadStrings(options) { export function loadStrings(options) {
var locale = getCurrentLocale(); const locale = getCurrentLocale();
var promises = []; const promises = [];
var optionsName; let optionsName;
if (typeof options === 'string') { if (typeof options === 'string') {
optionsName = options; optionsName = options;
} else { } else {
@ -140,10 +143,10 @@ define(['userSettings', 'events'], function (userSettings, events) {
return Promise.all(promises); return Promise.all(promises);
} }
var cacheParam = new Date().getTime(); const cacheParam = new Date().getTime();
function loadTranslation(translations, lang) { function loadTranslation(translations, lang) {
lang = normalizeLocaleName(lang); lang = normalizeLocaleName(lang);
var filtered = translations.filter(function (t) { let filtered = translations.filter(function (t) {
return normalizeLocaleName(t.lang) === lang; return normalizeLocaleName(t.lang) === lang;
}); });
@ -159,12 +162,12 @@ define(['userSettings', 'events'], function (userSettings, events) {
return; return;
} }
var url = filtered[0].path; let url = filtered[0].path;
url += url.indexOf('?') === -1 ? '?' : '&'; url += url.indexOf('?') === -1 ? '?' : '&';
url += 'v=' + cacheParam; url += 'v=' + cacheParam;
var xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
xhr.open('GET', url, true); xhr.open('GET', url, true);
xhr.onload = function (e) { xhr.onload = function (e) {
@ -183,8 +186,8 @@ define(['userSettings', 'events'], function (userSettings, events) {
} }
function translateKey(key) { function translateKey(key) {
var parts = key.split('#'); const parts = key.split('#');
var module; let module;
if (parts.length > 1) { if (parts.length > 1) {
module = parts[0]; module = parts[0];
@ -195,7 +198,7 @@ define(['userSettings', 'events'], function (userSettings, events) {
} }
function translateKeyFromModule(key, module) { function translateKeyFromModule(key, module) {
var dictionary = getDictionary(module, getCurrentLocale()); let dictionary = getDictionary(module, getCurrentLocale());
if (!dictionary || !dictionary[key]) { if (!dictionary || !dictionary[key]) {
dictionary = getDictionary(module, fallbackCulture); dictionary = getDictionary(module, fallbackCulture);
} }
@ -209,15 +212,15 @@ define(['userSettings', 'events'], function (userSettings, events) {
return str.split(find).join(replace); return str.split(find).join(replace);
} }
function translate(key) { export function translate(key) {
var val = translateKey(key); let val = translateKey(key);
for (var i = 1; i < arguments.length; i++) { for (let i = 1; i < arguments.length; i++) {
val = replaceAll(val, '{' + (i - 1) + '}', arguments[i]); val = replaceAll(val, '{' + (i - 1) + '}', arguments[i]);
} }
return val; return val;
} }
function translateHtml(html, module) { export function translateHtml(html, module) {
if (!module) { if (!module) {
module = defaultModule(); module = defaultModule();
} }
@ -225,26 +228,26 @@ define(['userSettings', 'events'], function (userSettings, events) {
throw new Error('module cannot be null or empty'); throw new Error('module cannot be null or empty');
} }
var startIndex = html.indexOf('${'); let startIndex = html.indexOf('${');
if (startIndex === -1) { if (startIndex === -1) {
return html; return html;
} }
startIndex += 2; startIndex += 2;
var endIndex = html.indexOf('}', startIndex); const endIndex = html.indexOf('}', startIndex);
if (endIndex === -1) { if (endIndex === -1) {
return html; return html;
} }
var key = html.substring(startIndex, endIndex); const key = html.substring(startIndex, endIndex);
var val = translateKeyFromModule(key, module); const val = translateKeyFromModule(key, module);
html = html.replace('${' + key + '}', val); html = html.replace('${' + key + '}', val);
return translateHtml(html, module); return translateHtml(html, module);
} }
var _defaultModule; let _defaultModule;
function defaultModule(val) { export function defaultModule(val) {
if (val) { if (val) {
_defaultModule = val; _defaultModule = val;
} }
@ -259,16 +262,15 @@ define(['userSettings', 'events'], function (userSettings, events) {
} }
}); });
return { export default {
getString: translate, translate,
translate: translate, translateHtml,
translateDocument: translateHtml, loadStrings,
translateHtml: translateHtml, defaultModule,
loadStrings: loadStrings, getCurrentLocale,
defaultModule: defaultModule, getCurrentDateTimeLocale,
getCurrentLocale: getCurrentLocale, register,
getCurrentDateTimeLocale: getCurrentDateTimeLocale, updateCurrentCulture
register: register, };
updateCurrentCulture: updateCurrentCulture
}; /* eslint-enable indent */
});

2
src/scripts/keyboardNavigation.js
View file

@ -155,7 +155,7 @@ export function enable() {
function attachGamepadScript(e) { function attachGamepadScript(e) {
console.log('Gamepad connected! Attaching gamepadtokey.js script'); console.log('Gamepad connected! Attaching gamepadtokey.js script');
window.removeEventListener('gamepadconnected', attachGamepadScript); window.removeEventListener('gamepadconnected', attachGamepadScript);
require(['scripts/gamepadtokey']); import('scripts/gamepadtokey');
} }
// No need to check for gamepads manually at load time, the eventhandler will be fired for that // No need to check for gamepads manually at load time, the eventhandler will be fired for that

53
src/scripts/playlists.js
View file

@ -1,10 +1,17 @@
define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', 'apphost', 'imageLoader', 'userSettings', 'emby-itemscontainer'], function (loading, listView, cardBuilder, libraryMenu, libraryBrowser, appHost, imageLoader, userSettings) { import loading from 'loading';
'use strict'; import listView from 'listView';
import cardBuilder from 'cardBuilder';
import libraryMenu from 'libraryMenu';
import libraryBrowser from 'libraryBrowser';
import appHost from 'apphost';
import imageLoader from 'imageLoader';
import userSettings from 'userSettings';
import 'emby-itemscontainer';
return function (view, params) { export default function (view, params) {
function getPageData(context) { function getPageData(context) {
var key = getSavedQueryKey(context); const key = getSavedQueryKey(context);
var pageData = data[key]; let pageData = data[key];
if (!pageData) { if (!pageData) {
pageData = data[key] = { pageData = data[key] = {
@ -51,8 +58,8 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
} }
function onViewStyleChange() { function onViewStyleChange() {
var viewStyle = getPageData(view).view; const viewStyle = getPageData(view).view;
var itemsContainer = view.querySelector('.itemsContainer'); const itemsContainer = view.querySelector('.itemsContainer');
if ('List' == viewStyle) { if ('List' == viewStyle) {
itemsContainer.classList.add('vertical-list'); itemsContainer.classList.add('vertical-list');
@ -67,16 +74,16 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
function reloadItems() { function reloadItems() {
showLoadingMessage(); showLoadingMessage();
var query = getQuery(view); const query = getQuery(view);
var promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query); const promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query);
// TODO: promise2 is unused, check if necessary. // TODO: promise2 is unused, check if necessary.
var promise2 = Dashboard.getCurrentUser(); const promise2 = Dashboard.getCurrentUser();
Promise.all([promise1, promise2]).then(function (responses) { Promise.all([promise1, promise2]).then(function (responses) {
var result = responses[0]; const result = responses[0];
// TODO: Is the scroll necessary? // TODO: Is the scroll necessary?
window.scrollTo(0, 0); window.scrollTo(0, 0);
var html = ''; let html = '';
var viewStyle = getPageData(view).view; const viewStyle = getPageData(view).view;
view.querySelector('.listTopPaging').innerHTML = libraryBrowser.getQueryPagingHtml({ view.querySelector('.listTopPaging').innerHTML = libraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex, startIndex: query.StartIndex,
limit: query.Limit, limit: query.Limit,
@ -135,10 +142,10 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
view.querySelector('.noItemsMessage').classList.remove('hide'); view.querySelector('.noItemsMessage').classList.remove('hide');
} }
var elem = view.querySelector('.itemsContainer'); const elem = view.querySelector('.itemsContainer');
elem.innerHTML = html; elem.innerHTML = html;
imageLoader.lazyChildren(elem); imageLoader.lazyChildren(elem);
var btnNextPage = view.querySelector('.btnNextPage'); const btnNextPage = view.querySelector('.btnNextPage');
if (btnNextPage) { if (btnNextPage) {
btnNextPage.addEventListener('click', function () { btnNextPage.addEventListener('click', function () {
@ -149,7 +156,7 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
}); });
} }
var btnPreviousPage = view.querySelector('.btnPreviousPage'); const btnPreviousPage = view.querySelector('.btnPreviousPage');
if (btnPreviousPage) { if (btnPreviousPage) {
btnPreviousPage.addEventListener('click', function () { btnPreviousPage.addEventListener('click', function () {
@ -160,11 +167,11 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
}); });
} }
var btnChangeLayout = view.querySelector('.btnChangeLayout'); const btnChangeLayout = view.querySelector('.btnChangeLayout');
if (btnChangeLayout) { if (btnChangeLayout) {
btnChangeLayout.addEventListener('layoutchange', function (e) { btnChangeLayout.addEventListener('layoutchange', function (e) {
var layout = e.detail.viewStyle; const layout = e.detail.viewStyle;
getPageData(view).view = layout; getPageData(view).view = layout;
libraryBrowser.saveViewSetting(getSavedQueryKey(view), layout); libraryBrowser.saveViewSetting(getSavedQueryKey(view), layout);
onViewStyleChange(); onViewStyleChange();
@ -177,13 +184,13 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
}); });
} }
var data = {}; const data = {};
view.addEventListener('viewbeforeshow', function () { view.addEventListener('viewbeforeshow', function () {
reloadItems(); reloadItems();
}); });
view.querySelector('.btnNewPlaylist').addEventListener('click', function () { view.querySelector('.btnNewPlaylist').addEventListener('click', function () {
require(['playlistEditor'], function (playlistEditor) { import('playlistEditor').then(({default: playlistEditor}) => {
var serverId = ApiClient.serverInfo().Id; const serverId = ApiClient.serverInfo().Id;
new playlistEditor.showEditor({ new playlistEditor.showEditor({
items: [], items: [],
serverId: serverId serverId: serverId
@ -191,5 +198,5 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
}); });
}); });
onViewStyleChange(); onViewStyleChange();
}; }
});

8
src/scripts/settings/appSettings.js
View file

@ -28,7 +28,7 @@ import events from 'events';
} }
export function enableAutomaticBitrateDetection(isInNetwork, mediaType, val) { export function enableAutomaticBitrateDetection(isInNetwork, mediaType, val) {
var key = 'enableautobitratebitrate-' + mediaType + '-' + isInNetwork; const key = 'enableautobitratebitrate-' + mediaType + '-' + isInNetwork;
if (val !== undefined) { if (val !== undefined) {
if (isInNetwork && mediaType === 'Audio') { if (isInNetwork && mediaType === 'Audio') {
val = true; val = true;
@ -45,7 +45,7 @@ import events from 'events';
} }
export function maxStreamingBitrate(isInNetwork, mediaType, val) { export function maxStreamingBitrate(isInNetwork, mediaType, val) {
var key = 'maxbitrate-' + mediaType + '-' + isInNetwork; const key = 'maxbitrate-' + mediaType + '-' + isInNetwork;
if (val !== undefined) { if (val !== undefined) {
if (isInNetwork && mediaType === 'Audio') { if (isInNetwork && mediaType === 'Audio') {
// nothing to do, this is always a max value // nothing to do, this is always a max value
@ -67,7 +67,7 @@ import events from 'events';
this.set('maxStaticMusicBitrate', val); this.set('maxStaticMusicBitrate', val);
} }
var defaultValue = 320000; const defaultValue = 320000;
return parseInt(this.get('maxStaticMusicBitrate') || defaultValue.toString()) || defaultValue; return parseInt(this.get('maxStaticMusicBitrate') || defaultValue.toString()) || defaultValue;
} }
@ -118,7 +118,7 @@ import events from 'events';
} }
export function set(name, value, userId) { export function set(name, value, userId) {
var currentValue = this.get(name, userId); const currentValue = this.get(name, userId);
appStorage.setItem(getKey(name, userId), value); appStorage.setItem(getKey(name, userId), value);
if (currentValue !== value) { if (currentValue !== value) {

20
src/scripts/settings/userSettings.js
View file

@ -2,7 +2,7 @@ import appSettings from 'appSettings';
import events from 'events'; import events from 'events';
function onSaveTimeout() { function onSaveTimeout() {
var self = this; const self = this;
self.saveTimeout = null; self.saveTimeout = null;
self.currentApiClient.updateDisplayPreferences('usersettings', self.displayPrefs, self.currentUserId, 'emby'); self.currentApiClient.updateDisplayPreferences('usersettings', self.displayPrefs, self.currentUserId, 'emby');
} }
@ -37,7 +37,7 @@ export class UserSettings {
return Promise.resolve(); return Promise.resolve();
} }
var self = this; const self = this;
return apiClient.getDisplayPreferences('usersettings', userId, 'emby').then(function (result) { return apiClient.getDisplayPreferences('usersettings', userId, 'emby').then(function (result) {
result.CustomPrefs = result.CustomPrefs || {}; result.CustomPrefs = result.CustomPrefs || {};
@ -63,9 +63,9 @@ export class UserSettings {
* @param {boolean} enableOnServer - Flag to save preferences on server. * @param {boolean} enableOnServer - Flag to save preferences on server.
*/ */
set(name, value, enableOnServer) { set(name, value, enableOnServer) {
var userId = this.currentUserId; const userId = this.currentUserId;
var currentValue = this.get(name, enableOnServer); const currentValue = this.get(name, enableOnServer);
var result = appSettings.set(name, value, userId); const result = appSettings.set(name, value, userId);
if (enableOnServer !== false && this.displayPrefs) { if (enableOnServer !== false && this.displayPrefs) {
this.displayPrefs.CustomPrefs[name] = value == null ? value : value.toString(); this.displayPrefs.CustomPrefs[name] = value == null ? value : value.toString();
@ -86,7 +86,7 @@ export class UserSettings {
* @return {string} Value of setting. * @return {string} Value of setting.
*/ */
get(name, enableOnServer) { get(name, enableOnServer) {
var userId = this.currentUserId; const userId = this.currentUserId;
if (enableOnServer !== false && this.displayPrefs) { if (enableOnServer !== false && this.displayPrefs) {
return this.displayPrefs.CustomPrefs[name]; return this.displayPrefs.CustomPrefs[name];
} }
@ -100,7 +100,7 @@ export class UserSettings {
* @return {Object|Promise} Configuration or Promise. * @return {Object|Promise} Configuration or Promise.
*/ */
serverConfig(config) { serverConfig(config) {
var apiClient = this.currentApiClient; const apiClient = this.currentApiClient;
if (config) { if (config) {
return apiClient.updateUserConfiguration(this.currentUserId, config); return apiClient.updateUserConfiguration(this.currentUserId, config);
} }
@ -349,7 +349,7 @@ export class UserSettings {
return this.set('libraryPageSize', parseInt(val, 10), false); return this.set('libraryPageSize', parseInt(val, 10), false);
} }
var libraryPageSize = parseInt(this.get('libraryPageSize', false), 10); const libraryPageSize = parseInt(this.get('libraryPageSize', false), 10);
if (libraryPageSize === 0) { if (libraryPageSize === 0) {
// Explicitly return 0 to avoid returning 100 because 0 is falsy. // Explicitly return 0 to avoid returning 100 because 0 is falsy.
return 0; return 0;
@ -378,7 +378,7 @@ export class UserSettings {
* @return {Object} Query. * @return {Object} Query.
*/ */
loadQuerySettings(key, query) { loadQuerySettings(key, query) {
var values = this.get(key); let values = this.get(key);
if (values) { if (values) {
values = JSON.parse(values); values = JSON.parse(values);
return Object.assign(query, values); return Object.assign(query, values);
@ -393,7 +393,7 @@ export class UserSettings {
* @param {Object} query - Query. * @param {Object} query - Query.
*/ */
saveQuerySettings(key, query) { saveQuerySettings(key, query) {
var values = {}; const values = {};
if (query.SortBy) { if (query.SortBy) {
values.SortBy = query.SortBy; values.SortBy = query.SortBy;
} }

6
src/scripts/site.js
View file

@ -422,7 +422,7 @@ var AppInfo = {};
require(['globalize', 'browser'], function (globalize, browser) { require(['globalize', 'browser'], function (globalize, browser) {
window.Globalize = globalize; window.Globalize = globalize;
loadCoreDictionary(globalize).then(function () { loadCoreDictionary(globalize).then(function () {
onGlobalizeInit(browser); onGlobalizeInit(browser, globalize);
}); });
}); });
require(['keyboardnavigation'], function(keyboardnavigation) { require(['keyboardnavigation'], function(keyboardnavigation) {
@ -455,14 +455,14 @@ var AppInfo = {};
}); });
} }
function onGlobalizeInit(browser) { function onGlobalizeInit(browser, globalize) {
if ('android' === self.appMode) { if ('android' === self.appMode) {
if (-1 !== self.location.href.toString().toLowerCase().indexOf('start=backgroundsync')) { if (-1 !== self.location.href.toString().toLowerCase().indexOf('start=backgroundsync')) {
return onAppReady(browser); return onAppReady(browser);
} }
} }
document.title = Globalize.translateDocument(document.title, 'core'); document.title = globalize.translateHtml(document.title, 'core');
if (browser.tv && !browser.android) { if (browser.tv && !browser.android) {
console.debug('using system fonts with explicit sizes'); console.debug('using system fonts with explicit sizes');

27
src/scripts/taskbutton.js
View file

@ -1,7 +1,11 @@
define(['events', 'userSettings', 'serverNotifications', 'connectionManager', 'globalize', 'emby-button'], function (events, userSettings, serverNotifications, connectionManager, globalize) { import events from 'events';
'use strict'; import * as userSettings from 'userSettings';
import serverNotifications from 'serverNotifications';
import connectionManager from 'connectionManager';
import globalize from 'globalize';
import 'emby-button';
return function (options) { export default function (options) {
function pollTasks() { function pollTasks() {
connectionManager.getApiClient(serverId).getScheduledTasks({ connectionManager.getApiClient(serverId).getScheduledTasks({
IsEnabled: true IsEnabled: true
@ -9,7 +13,7 @@ define(['events', 'userSettings', 'serverNotifications', 'connectionManager', 'g
} }
function updateTasks(tasks) { function updateTasks(tasks) {
var task = tasks.filter(function (t) { const task = tasks.filter(function (t) {
return t.Key == options.taskKey; return t.Key == options.taskKey;
})[0]; })[0];
@ -32,7 +36,7 @@ define(['events', 'userSettings', 'serverNotifications', 'connectionManager', 'g
} }
button.setAttribute('data-taskid', task.Id); button.setAttribute('data-taskid', task.Id);
var progress = (task.CurrentProgressPercentage || 0).toFixed(1); const progress = (task.CurrentProgressPercentage || 0).toFixed(1);
if (options.progressElem) { if (options.progressElem) {
options.progressElem.value = progress; options.progressElem.value = progress;
@ -45,7 +49,7 @@ define(['events', 'userSettings', 'serverNotifications', 'connectionManager', 'g
} }
if (options.lastResultElem) { if (options.lastResultElem) {
var lastResult = task.LastExecutionResult ? task.LastExecutionResult.Status : ''; const lastResult = task.LastExecutionResult ? task.LastExecutionResult.Status : '';
if (lastResult == 'Failed') { if (lastResult == 'Failed') {
options.lastResultElem.html('<span style="color:#FF0000;">(' + globalize.translate('LabelFailed') + ')</span>'); options.lastResultElem.html('<span style="color:#FF0000;">(' + globalize.translate('LabelFailed') + ')</span>');
@ -73,9 +77,9 @@ define(['events', 'userSettings', 'serverNotifications', 'connectionManager', 'g
} }
} }
var pollInterval; let pollInterval;
var button = options.button; const button = options.button;
var serverId = ApiClient.serverId(); const serverId = ApiClient.serverId();
function onPollIntervalFired() { function onPollIntervalFired() {
if (!connectionManager.getApiClient(serverId).isMessageChannelOpen()) { if (!connectionManager.getApiClient(serverId).isMessageChannelOpen()) {
@ -84,7 +88,7 @@ define(['events', 'userSettings', 'serverNotifications', 'connectionManager', 'g
} }
function startInterval() { function startInterval() {
var apiClient = connectionManager.getApiClient(serverId); const apiClient = connectionManager.getApiClient(serverId);
if (pollInterval) { if (pollInterval) {
clearInterval(pollInterval); clearInterval(pollInterval);
@ -115,5 +119,4 @@ define(['events', 'userSettings', 'serverNotifications', 'connectionManager', 'g
startInterval(); startInterval();
events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate); events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
} }
}; }
});

73
src/scripts/touchHelper.js
View file

@ -1,31 +1,31 @@
define(['dom', 'events'], function (dom, events) { import dom from 'dom';
'use strict'; import events from 'events';
function getTouches(e) {
function getTouches(e) {
return e.changedTouches || e.targetTouches || e.touches; return e.changedTouches || e.targetTouches || e.touches;
} }
function TouchHelper(elem, options) { class TouchHelper {
constructor(elem, options) {
options = options || {}; options = options || {};
var touchTarget; let touchTarget;
var touchStartX; let touchStartX;
var touchStartY; let touchStartY;
var lastDeltaX; let lastDeltaX;
var lastDeltaY; let lastDeltaY;
var thresholdYMet; let thresholdYMet;
var self = this; const self = this;
var swipeXThreshold = options.swipeXThreshold || 50; const swipeXThreshold = options.swipeXThreshold || 50;
var swipeYThreshold = options.swipeYThreshold || 50; const swipeYThreshold = options.swipeYThreshold || 50;
var swipeXMaxY = 30; const swipeXMaxY = 30;
var excludeTagNames = options.ignoreTagNames || []; const excludeTagNames = options.ignoreTagNames || [];
var touchStart = function (e) { const touchStart = function (e) {
var touch = getTouches(e)[0]; const touch = getTouches(e)[0];
touchTarget = null; touchTarget = null;
touchStartX = 0; touchStartX = 0;
touchStartY = 0; touchStartY = 0;
@ -35,7 +35,7 @@ define(['dom', 'events'], function (dom, events) {
if (touch) { if (touch) {
var currentTouchTarget = touch.target; const currentTouchTarget = touch.target;
if (dom.parentWithTag(currentTouchTarget, excludeTagNames)) { if (dom.parentWithTag(currentTouchTarget, excludeTagNames)) {
return; return;
@ -47,18 +47,18 @@ define(['dom', 'events'], function (dom, events) {
} }
}; };
var touchEnd = function (e) { const touchEnd = function (e) {
var isTouchMove = e.type === 'touchmove'; const isTouchMove = e.type === 'touchmove';
if (touchTarget) { if (touchTarget) {
var touch = getTouches(e)[0]; const touch = getTouches(e)[0];
var deltaX; let deltaX;
var deltaY; let deltaY;
var clientX; let clientX;
var clientY; let clientY;
if (touch) { if (touch) {
clientX = touch.clientX || 0; clientX = touch.clientX || 0;
@ -70,8 +70,8 @@ define(['dom', 'events'], function (dom, events) {
deltaY = 0; deltaY = 0;
} }
var currentDeltaX = lastDeltaX == null ? deltaX : (deltaX - lastDeltaX); const currentDeltaX = lastDeltaX == null ? deltaX : (deltaX - lastDeltaX);
var currentDeltaY = lastDeltaY == null ? deltaY : (deltaY - lastDeltaY); const currentDeltaY = lastDeltaY == null ? deltaY : (deltaY - lastDeltaY);
lastDeltaX = deltaX; lastDeltaX = deltaX;
lastDeltaY = deltaY; lastDeltaY = deltaY;
@ -138,14 +138,13 @@ define(['dom', 'events'], function (dom, events) {
passive: true passive: true
}); });
} }
destroy() {
TouchHelper.prototype.destroy = function () { const elem = this.elem;
var elem = this.elem;
if (elem) { if (elem) {
var touchStart = this.touchStart; const touchStart = this.touchStart;
var touchEnd = this.touchEnd; const touchEnd = this.touchEnd;
dom.removeEventListener(elem, 'touchstart', touchStart, { dom.removeEventListener(elem, 'touchstart', touchStart, {
passive: true passive: true
@ -165,7 +164,7 @@ define(['dom', 'events'], function (dom, events) {
this.touchEnd = null; this.touchEnd = null;
this.elem = null; this.elem = null;
}; }
}
return TouchHelper; export default TouchHelper;
});