diff --git a/src/controllers/dashboard/mediaLibrary.js b/src/controllers/dashboard/mediaLibrary.js index 1284602e4c..e7f00e8358 100644 --- a/src/controllers/dashboard/mediaLibrary.js +++ b/src/controllers/dashboard/mediaLibrary.js @@ -14,7 +14,7 @@ import 'emby-itemrefreshindicator'; function addVirtualFolder(page) { import('medialibrarycreator').then(({default: medialibrarycreator}) => { - new medialibrarycreator.showEditor({ + new medialibrarycreator({ collectionTypeOptions: getCollectionTypeOptions().filter(function (f) { return !f.hidden; }), @@ -28,8 +28,8 @@ import 'emby-itemrefreshindicator'; } function editVirtualFolder(page, virtualFolder) { - import('medialibraryeditor').then(({default:medialibraryeditor }) => { - new medialibraryeditor.showEditor({ + import('medialibraryeditor').then(({default: medialibraryeditor}) => { + new medialibraryeditor({ refresh: shouldRefreshLibraryAfterChanges(page), library: virtualFolder }).then(function (hasChanges) { @@ -41,7 +41,7 @@ import 'emby-itemrefreshindicator'; } function deleteVirtualFolder(page, virtualFolder) { - var msg = globalize.translate('MessageAreYouSureYouWishToRemoveMediaFolder'); + let msg = globalize.translate('MessageAreYouSureYouWishToRemoveMediaFolder'); if (virtualFolder.Locations.length) { msg += '

' + globalize.translate('MessageTheFollowingLocationWillBeRemovedFromLibrary') + '

'; @@ -57,7 +57,7 @@ import 'emby-itemrefreshindicator'; primary: 'delete' }).then(function () { - var refreshAfterChange = shouldRefreshLibraryAfterChanges(page); + const refreshAfterChange = shouldRefreshLibraryAfterChanges(page); ApiClient.removeVirtualFolder(virtualFolder.Name, refreshAfterChange).then(function () { reloadLibrary(page); }); @@ -82,7 +82,7 @@ import 'emby-itemrefreshindicator'; confirmText: globalize.translate('ButtonRename') }).then(function (newName) { if (newName && newName != virtualFolder.Name) { - var refreshAfterChange = shouldRefreshLibraryAfterChanges(page); + const refreshAfterChange = shouldRefreshLibraryAfterChanges(page); ApiClient.renameVirtualFolder(virtualFolder.Name, newName, refreshAfterChange).then(function () { reloadLibrary(page); }); @@ -92,10 +92,10 @@ import 'emby-itemrefreshindicator'; } function showCardMenu(page, elem, virtualFolders) { - var card = dom.parentWithClass(elem, 'card'); - var index = parseInt(card.getAttribute('data-index')); - var virtualFolder = virtualFolders[index]; - var menuItems = []; + const card = dom.parentWithClass(elem, 'card'); + const index = parseInt(card.getAttribute('data-index')); + const virtualFolder = virtualFolders[index]; + const menuItems = []; menuItems.push({ name: globalize.translate('ButtonEditImages'), id: 'editimages', @@ -164,7 +164,7 @@ import 'emby-itemrefreshindicator'; } function reloadVirtualFolders(page, virtualFolders) { - var html = ''; + let html = ''; virtualFolders.push({ Name: globalize.translate('ButtonAddMediaLibrary'), icon: 'add_circle', @@ -175,12 +175,12 @@ import 'emby-itemrefreshindicator'; showNameWithIcon: true }); - for (var i = 0; i < virtualFolders.length; i++) { - var virtualFolder = virtualFolders[i]; + for (let i = 0; i < virtualFolders.length; i++) { + const virtualFolder = virtualFolders[i]; html += getVirtualFolderHtml(page, virtualFolder, i); } - var divVirtualFolders = page.querySelector('#divVirtualFolders'); + const divVirtualFolders = page.querySelector('#divVirtualFolders'); divVirtualFolders.innerHTML = html; divVirtualFolders.classList.add('itemsContainer'); divVirtualFolders.classList.add('vertical-wrap'); @@ -191,9 +191,9 @@ import 'emby-itemrefreshindicator'; addVirtualFolder(page); }); $('.editLibrary', divVirtualFolders).on('click', function () { - var card = $(this).parents('.card')[0]; - var index = parseInt(card.getAttribute('data-index')); - var virtualFolder = virtualFolders[index]; + const card = $(this).parents('.card')[0]; + const index = parseInt(card.getAttribute('data-index')); + const virtualFolder = virtualFolders[index]; if (virtualFolder.ItemId) { editVirtualFolder(page, virtualFolder); @@ -251,8 +251,8 @@ import 'emby-itemrefreshindicator'; } function getVirtualFolderHtml(page, virtualFolder, index) { - var html = ''; - var style = ''; + let html = ''; + let style = ''; if (page.classList.contains('wizardPage')) { style += 'min-width:33.3%;'; @@ -263,7 +263,7 @@ import 'emby-itemrefreshindicator'; html += '
'; html += '
'; html += '
'; - var imgUrl = ''; + let imgUrl = ''; if (virtualFolder.PrimaryImageItemId) { imgUrl = ApiClient.getScaledImageUrl(virtualFolder.PrimaryImageItemId, { @@ -272,7 +272,7 @@ import 'emby-itemrefreshindicator'; }); } - var hasCardImageContainer; + let hasCardImageContainer; if (imgUrl) { html += '
"; @@ -322,7 +322,7 @@ import 'emby-itemrefreshindicator'; } html += '
'; - var typeName = getCollectionTypeOptions().filter(function (t) { + let typeName = getCollectionTypeOptions().filter(function (t) { return t.value == virtualFolder.CollectionType; })[0]; typeName = typeName ? typeName.name : globalize.translate('FolderTypeUnset'); @@ -382,7 +382,7 @@ import 'emby-itemrefreshindicator'; }); pageIdOn('pageshow', 'mediaLibraryPage', function () { libraryMenu.setTabs('librarysetup', 0, getTabs); - var page = this; + const page = this; taskButton({ mode: 'on', progressElem: page.querySelector('.refreshProgress'), @@ -391,7 +391,7 @@ import 'emby-itemrefreshindicator'; }); }); pageIdOn('pagebeforehide', 'mediaLibraryPage', function () { - var page = this; + const page = this; taskButton({ mode: 'off', progressElem: page.querySelector('.refreshProgress'), diff --git a/src/controllers/dashboard/networking.js b/src/controllers/dashboard/networking.js index e9fdec6391..5b0342ec2a 100644 --- a/src/controllers/dashboard/networking.js +++ b/src/controllers/dashboard/networking.js @@ -7,11 +7,11 @@ import 'emby-select'; /* eslint-disable indent */ function onSubmit(e) { - var form = this; - var localAddress = form.querySelector('#txtLocalAddress').value; - var enableUpnp = form.querySelector('#chkEnableUpnp').checked; + const form = this; + const localAddress = form.querySelector('#txtLocalAddress').value; + const enableUpnp = form.querySelector('#chkEnableUpnp').checked; confirmSelections(localAddress, enableUpnp, function () { - var validationResult = getValidationAlert(form); + const validationResult = getValidationAlert(form); if (validationResult) { showAlertText(validationResult); @@ -52,7 +52,7 @@ import 'emby-select'; } function triggerChange(select) { - var evt = document.createEvent('HTMLEvents'); + const evt = document.createEvent('HTMLEvents'); evt.initEvent('change', false, true); select.dispatchEvent(evt); } @@ -70,8 +70,8 @@ import 'emby-select'; } function validateHttps(form) { - var certPath = form.querySelector('#txtCertificatePath').value || null; - var httpsEnabled = form.querySelector('#chkEnableHttps').checked; + const certPath = form.querySelector('#txtCertificatePath').value || null; + const httpsEnabled = form.querySelector('#chkEnableHttps').checked; if (httpsEnabled && !certPath) { return showAlertText({ @@ -116,7 +116,7 @@ import 'emby-select'; page.querySelector('#chkEnableHttps').checked = config.EnableHttps; page.querySelector('#chkRequireHttps').checked = config.RequireHttps; page.querySelector('#txtBaseUrl').value = config.BaseUrl || ''; - var txtCertificatePath = page.querySelector('#txtCertificatePath'); + const txtCertificatePath = page.querySelector('#txtCertificatePath'); txtCertificatePath.value = config.CertificatePath || ''; page.querySelector('#txtCertPassword').value = config.CertificatePassword || ''; page.querySelector('#chkEnableUpnp').checked = config.EnableUPnP; @@ -141,7 +141,7 @@ import 'emby-select'; }); view.querySelector('#btnSelectCertPath').addEventListener('click', function () { require(['directorybrowser'], function (directoryBrowser) { - var picker = new directoryBrowser(); + const picker = new directoryBrowser(); picker.show({ includeFiles: true, includeDirectories: true, @@ -163,6 +163,6 @@ import 'emby-select'; loadPage(view, config); }); }); - }; + } /* eslint-enable indent */ diff --git a/src/controllers/dashboard/playback.js b/src/controllers/dashboard/playback.js index 9c7bc00b4f..0406c21926 100644 --- a/src/controllers/dashboard/playback.js +++ b/src/controllers/dashboard/playback.js @@ -14,7 +14,7 @@ import globalize from 'globalize'; function onSubmit() { loading.show(); - var form = this; + const form = this; ApiClient.getServerConfiguration().then(function (config) { config.MinResumePct = $('#txtMinResumePct', form).val(); config.MaxResumePct = $('#txtMaxResumePct', form).val(); @@ -44,7 +44,7 @@ import globalize from 'globalize'; }).on('pageshow', '#playbackConfigurationPage', function () { loading.show(); libraryMenu.setTabs('playback', 1, getTabs); - var page = this; + const page = this; ApiClient.getServerConfiguration().then(function (config) { loadPage(page, config); }); diff --git a/src/controllers/dashboard/serveractivity.js b/src/controllers/dashboard/serveractivity.js index 624c5cc4ad..ed56126267 100644 --- a/src/controllers/dashboard/serveractivity.js +++ b/src/controllers/dashboard/serveractivity.js @@ -4,7 +4,7 @@ import globalize from 'globalize'; /* eslint-disable indent */ export default function (view, params) { - var activityLog; + let activityLog; if (params.useractivity !== 'false') { view.querySelector('.activityItems').setAttribute('data-useractivity', 'true'); @@ -29,6 +29,6 @@ import globalize from 'globalize'; activityLog = null; }); - }; + } /* eslint-enable indent */