diff --git a/package.json b/package.json index 230eee3f21..1e687d7f4f 100644 --- a/package.json +++ b/package.json @@ -129,6 +129,9 @@ "src/components/syncPlay/playbackPermissionManager.js", "src/components/syncPlay/syncPlayManager.js", "src/components/syncPlay/timeSyncManager.js", + "src/controllers/dashboard/apikeys.js", + "src/controllers/dashboard/dashboard.js", + "src/controllers/dashboard/encodingsettings.js", "src/controllers/dashboard/logs.js", "src/controllers/user/subtitles.js", "src/controllers/dashboard/plugins/repositories.js", diff --git a/src/controllers/dashboard/apikeys.js b/src/controllers/dashboard/apikeys.js index f43bfd0329..8c68a2e93b 100644 --- a/src/controllers/dashboard/apikeys.js +++ b/src/controllers/dashboard/apikeys.js @@ -1,8 +1,14 @@ -define(['datetime', 'loading', 'libraryMenu', 'dom', 'globalize', 'emby-button'], function (datetime, loading, libraryMenu, dom, globalize) { - 'use strict'; +import datetime from 'datetime'; +import loading from 'loading'; +import libraryMenu from 'libraryMenu'; +import dom from 'dom'; +import globalize from 'globalize'; +import 'emby-button'; + +/* eslint-disable indent */ function revoke(page, key) { - require(['confirm'], function (confirm) { + import('confirm').then(({default: confirm}) => { confirm(globalize.translate('MessageConfirmRevokeApiKey'), globalize.translate('HeaderConfirmRevokeApiKey')).then(function () { loading.show(); ApiClient.ajax({ @@ -46,7 +52,7 @@ define(['datetime', 'loading', 'libraryMenu', 'dom', 'globalize', 'emby-button'] } function showNewKeyPrompt(page) { - require(['prompt'], function (prompt) { + import('prompt').then(({default: prompt}) => { prompt({ title: globalize.translate('HeaderNewApiKey'), label: globalize.translate('LabelAppName'), @@ -80,4 +86,5 @@ define(['datetime', 'loading', 'libraryMenu', 'dom', 'globalize', 'emby-button'] pageIdOn('pagebeforeshow', 'apiKeysPage', function () { loadData(this); }); -}); + +/* eslint-enable indent */ diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js index 6a378903d3..55e24f49d5 100644 --- a/src/controllers/dashboard/dashboard.js +++ b/src/controllers/dashboard/dashboard.js @@ -1,8 +1,29 @@ -define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'loading', 'connectionManager', 'playMethodHelper', 'cardBuilder', 'imageLoader', 'components/activitylog', 'scripts/imagehelper', 'indicators', 'listViewStyle', 'emby-button', 'flexStyles', 'emby-button', 'emby-itemscontainer'], function (datetime, events, itemHelper, serverNotifications, dom, globalize, datefns, dfnshelper, loading, connectionManager, playMethodHelper, cardBuilder, imageLoader, ActivityLog, imageHelper, indicators) { - 'use strict'; +import datetime from 'datetime'; +import events from 'events'; +import itemHelper from 'itemHelper'; +import serverNotifications from 'serverNotifications'; +import dom from 'dom'; +import globalize from 'globalize'; +import * as datefns from 'date-fns'; +import dfnshelper from 'dfnshelper'; +import loading from 'loading'; +import connectionManager from 'connectionManager'; +import playMethodHelper from 'playMethodHelper'; +import cardBuilder from 'cardBuilder'; +import imageLoader from 'imageLoader'; +import ActivityLog from 'components/activitylog'; +import imageHelper from 'scripts/imagehelper'; +import indicators from 'indicators'; +import 'listViewStyle'; +import 'emby-button'; +import 'flexStyles'; +import 'emby-button'; +import 'emby-itemscontainer'; + +/* eslint-disable indent */ function showPlaybackInfo(btn, session) { - require(['alert'], function (alert) { + import('alert').then(({default: Alert}) => { var title; var text = []; var displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session); @@ -33,7 +54,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa } function showSendMessageForm(btn, session) { - require(['prompt'], function (prompt) { + import('prompt').then(({default: prompt}) => { prompt({ title: globalize.translate('HeaderSendMessage'), label: globalize.translate('LabelMessageText'), @@ -50,7 +71,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa } function showOptionsMenu(btn, session) { - require(['actionsheet'], function (actionsheet) { + import('actionsheet').then(({default: actionsheet}) => { var menuItems = []; if (session.ServerId && session.DeviceId !== connectionManager.deviceId()) { @@ -706,7 +727,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa }); }, restart: function (btn) { - require(['confirm'], function (confirm) { + import('confirm').then(({default: confirm}) => { confirm({ title: globalize.translate('HeaderRestart'), text: globalize.translate('MessageConfirmRestart'), @@ -721,7 +742,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa }); }, shutdown: function (btn) { - require(['confirm'], function (confirm) { + import('confirm').then(({default: confirm}) => { confirm({ title: globalize.translate('HeaderShutdown'), text: globalize.translate('MessageConfirmShutdown'), @@ -736,7 +757,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa }); } }; - return function (view, params) { + export default function (view, params) { function onRestartRequired(evt, apiClient) { console.debug('onRestartRequired not implemented', evt, apiClient); } @@ -843,5 +864,6 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa serverActivityLog.destroy(); } }); - }; -}); + } + +/* eslint-enable indent */ diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js index 0f54f9d70f..fd91db4bb4 100644 --- a/src/controllers/dashboard/encodingsettings.js +++ b/src/controllers/dashboard/encodingsettings.js @@ -1,5 +1,10 @@ -define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, loading, globalize, dom, libraryMenu) { - 'use strict'; +import $ from 'jQuery'; +import loading from 'loading'; +import globalize from 'globalize'; +import dom from 'dom'; +import libraryMenu from 'libraryMenu'; + +/* eslint-disable indent */ function loadPage(page, config, systemInfo) { Array.prototype.forEach.call(page.querySelectorAll('.chkDecodeCodec'), function (c) { @@ -30,7 +35,7 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo var msg = ''; msg = globalize.translate('FFmpegSavePathNotFound'); - require(['alert'], function (alert) { + import('alert').then(({default: alert}) => { alert(msg); }); } @@ -75,7 +80,7 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo ApiClient.updateNamedConfiguration('encoding', config).then(function () { updateEncoder(form); }, function () { - require(['alert'], function (alert) { + import('alert').then(({default: alert}) => { alert(globalize.translate('DefaultErrorMessage')); }); @@ -85,7 +90,7 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo }; if ($('#selectVideoDecoder', form).val()) { - require(['alert'], function (alert) { + import('alert').then(({default: alert}) => { alert({ title: globalize.translate('TitleHardwareAcceleration'), text: globalize.translate('HardwareAccelerationWarning') @@ -150,7 +155,7 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo setDecodingCodecsVisible(page, this.value); }); $('#btnSelectEncoderPath', page).on('click.selectDirectory', function () { - require(['directorybrowser'], function (directoryBrowser) { + import('directorybrowser').then(({default: directoryBrowser}) => { var picker = new directoryBrowser(); picker.show({ includeFiles: true, @@ -165,7 +170,7 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo }); }); $('#btnSelectTranscodingTempPath', page).on('click.selectDirectory', function () { - require(['directorybrowser'], function (directoryBrowser) { + import('directorybrowser').then(({default: directoryBrowser}) => { var picker = new directoryBrowser(); picker.show({ callback: function (path) { @@ -192,4 +197,5 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo }); }); }); -}); + +/* eslint-enable indent */