diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js index ee51776ce0..05c221f5d4 100644 --- a/src/components/nowPlayingBar/nowPlayingBar.js +++ b/src/components/nowPlayingBar/nowPlayingBar.js @@ -15,6 +15,7 @@ import appFooter from '../appFooter/appFooter'; import itemShortcuts from '../shortcuts'; import './nowPlayingBar.css'; import '../../elements/emby-slider/emby-slider'; +import { appRouter } from '../appRouter'; /* eslint-disable indent */ @@ -248,9 +249,7 @@ import '../../elements/emby-slider/emby-slider'; } function showRemoteControl() { - import('../appRouter').then(({default: appRouter}) => { - appRouter.showNowPlaying(); - }); + appRouter.showNowPlaying(); } let nowPlayingBarElement; diff --git a/src/components/playback/playerSelectionMenu.js b/src/components/playback/playerSelectionMenu.js index d123cc2c31..1afd8189cb 100644 --- a/src/components/playback/playerSelectionMenu.js +++ b/src/components/playback/playerSelectionMenu.js @@ -7,6 +7,10 @@ import { appRouter } from '../appRouter'; import globalize from '../../scripts/globalize'; import { appHost } from '../apphost'; import { enable, isEnabled, supported } from '../../scripts/autocast'; +import '../../elements/emby-checkbox/emby-checkbox'; +import '../../elements/emby-button/emby-button'; +import dialog from '../dialog/dialog'; +import dialogHelper from '../dialogHelper/dialogHelper'; function mirrorItem(info, player) { const item = info.item; @@ -140,47 +144,38 @@ export function show(button) { } function showActivePlayerMenu(playerInfo) { - Promise.all([ - import('../dialogHelper/dialogHelper'), - import('../dialog/dialog'), - import('../../elements/emby-checkbox/emby-checkbox'), - import('../../elements/emby-button/emby-button') - ]).then(([dialogHelper]) => { - showActivePlayerMenuInternal(dialogHelper, playerInfo); - }); + showActivePlayerMenuInternal(dialogHelper, playerInfo); } function disconnectFromPlayer(currentDeviceName) { if (playbackManager.getSupportedCommands().indexOf('EndSession') !== -1) { - import('../dialog/dialog').then(({default: dialog}) => { - const menuItems = []; + const menuItems = []; - menuItems.push({ - name: globalize.translate('Yes'), - id: 'yes' - }); - menuItems.push({ - name: globalize.translate('No'), - id: 'no' - }); + menuItems.push({ + name: globalize.translate('Yes'), + id: 'yes' + }); + menuItems.push({ + name: globalize.translate('No'), + id: 'no' + }); - dialog({ - buttons: menuItems, - text: globalize.translate('ConfirmEndPlayerSession', currentDeviceName) + dialog.show({ + buttons: menuItems, + text: globalize.translate('ConfirmEndPlayerSession', currentDeviceName) - }).then(function (id) { - switch (id) { - case 'yes': - playbackManager.getCurrentPlayer().endSession(); - playbackManager.setDefaultPlayerActive(); - break; - case 'no': - playbackManager.setDefaultPlayerActive(); - break; - default: - break; - } - }); + }).then(function (id) { + switch (id) { + case 'yes': + playbackManager.getCurrentPlayer().endSession(); + playbackManager.setDefaultPlayerActive(); + break; + case 'no': + playbackManager.setDefaultPlayerActive(); + break; + default: + break; + } }); } else { playbackManager.setDefaultPlayerActive(); diff --git a/src/components/pluginManager.js b/src/components/pluginManager.js index 5fef19ccea..66d7fcd653 100644 --- a/src/components/pluginManager.js +++ b/src/components/pluginManager.js @@ -42,7 +42,7 @@ import globalize from '../scripts/globalize'; return Promise.resolve(plugin); } else { return new Promise((resolve, reject) => { - PluginManager.loadStrings(plugin) + this.#loadStrings(plugin) .then(function () { resolve(plugin); }) diff --git a/src/components/recordingcreator/recordinghelper.js b/src/components/recordingcreator/recordinghelper.js index b965c3cd0e..2a7682a4e6 100644 --- a/src/components/recordingcreator/recordinghelper.js +++ b/src/components/recordingcreator/recordinghelper.js @@ -3,6 +3,7 @@ import loading from '../loading/loading'; import ServerConnections from '../ServerConnections'; import toast from '../toast/toast'; import confirm from '../confirm/confirm'; +import dialog from '../dialog/dialog'; /*eslint prefer-const: "error"*/ @@ -100,60 +101,56 @@ function sendToast(msg) { function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus, seriesTimerId) { return new Promise(function (resolve, reject) { - import('../dialog/dialog').then((dialog) => { - const items = []; + const items = []; + items.push({ + name: globalize.translate('HeaderKeepRecording'), + id: 'cancel', + type: 'submit' + }); + + if (timerStatus === 'InProgress') { items.push({ - name: globalize.translate('HeaderKeepRecording'), - id: 'cancel', - type: 'submit' - }); - - if (timerStatus === 'InProgress') { - items.push({ - name: globalize.translate('HeaderStopRecording'), - id: 'canceltimer', - type: 'cancel' - }); - } else { - items.push({ - name: globalize.translate('HeaderCancelRecording'), - id: 'canceltimer', - type: 'cancel' - }); - } - - items.push({ - name: globalize.translate('HeaderCancelSeries'), - id: 'cancelseriestimer', + name: globalize.translate('HeaderStopRecording'), + id: 'canceltimer', type: 'cancel' }); + } else { + items.push({ + name: globalize.translate('HeaderCancelRecording'), + id: 'canceltimer', + type: 'cancel' + }); + } - dialog({ - - text: globalize.translate('MessageConfirmRecordingCancellation'), - buttons: items - - }).then(function (result) { - const apiClient = ServerConnections.getApiClient(serverId); - - if (result === 'canceltimer') { - loading.show(); - - cancelTimer(apiClient, timerId, true).then(resolve, reject); - } else if (result === 'cancelseriestimer') { - loading.show(); - - apiClient.cancelLiveTvSeriesTimer(seriesTimerId).then(function () { - toast(globalize.translate('SeriesCancelled')); - loading.hide(); - resolve(); - }, reject); - } else { - resolve(); - } - }, reject); + items.push({ + name: globalize.translate('HeaderCancelSeries'), + id: 'cancelseriestimer', + type: 'cancel' }); + + dialog.show({ + text: globalize.translate('MessageConfirmRecordingCancellation'), + buttons: items + }).then(function (result) { + const apiClient = ServerConnections.getApiClient(serverId); + + if (result === 'canceltimer') { + loading.show(); + + cancelTimer(apiClient, timerId, true).then(resolve, reject); + } else if (result === 'cancelseriestimer') { + loading.show(); + + apiClient.cancelLiveTvSeriesTimer(seriesTimerId).then(function () { + toast(globalize.translate('SeriesCancelled')); + loading.hide(); + resolve(); + }, reject); + } else { + resolve(); + } + }, reject); }); }