solved imports for alert, toast and confirm

src/components/activitylog.js

@@ -7,6 +7,7 @@ import serverNotifications from '../scripts/serverNotifications';
 import '../elements/emby-button/emby-button';
 import './listview/listview.css';
 import ServerConnections from './ServerConnections';
+import alert from './alert';
 
 /* eslint-disable indent */
 
@@ -128,11 +129,9 @@ import ServerConnections from './ServerConnections';
     }
 
     function showItemOverview(item) {
-        import('./alert').then((alert) => {
         alert({
             text: item.Overview
         });
-        });
     }
 
 class ActivityLog {

src/components/appRouter.js

@@ -11,6 +11,7 @@ import viewManager from './viewManager/viewManager';
 import AppInfo from './AppInfo';
 import Dashboard from '../scripts/clientUtils';
 import ServerConnections from './ServerConnections';
+import alert from './alert';
 
 class AppRouter {
     allRoutes = [];
@@ -289,14 +290,12 @@ class AppRouter {
                 this.showWelcome();
                 break;
             case 'ServerUpdateNeeded':
-                import('./alert').then((alert) =>{
                 alert({
                     text: globalize.translate('ServerUpdateNeeded', 'https://github.com/jellyfin/jellyfin'),
                     html: globalize.translate('ServerUpdateNeeded', '<a href="https://github.com/jellyfin/jellyfin">https://github.com/jellyfin/jellyfin</a>')
                 }).then(() => {
                     this.showSelectServer();
                 });
-                });
                 break;
             default:
                 break;
@@ -410,9 +409,7 @@ class AppRouter {
         this.forcedLogoutMsg = null;
 
         if (msg) {
-            import('./alert').then((alert) => {
             alert(msg);
-            });
         }
     }
 

src/components/confirm/confirm.js

@@ -2,15 +2,11 @@ import browser from '../../scripts/browser';
 import dialog from '../dialog/dialog';
 import globalize from '../../scripts/globalize';
 
-/* eslint-disable indent */
-export default (() => {
 function replaceAll(str, find, replace) {
     return str.split(find).join(replace);
 }
 
-    if (browser.tv && window.confirm) {
+function nativeConfirm(options) {
-        // Use the native confirm dialog
-        return options => {
     if (typeof options === 'string') {
         options = {
             title: '',
@@ -26,10 +22,9 @@ export default (() => {
     } else {
         return Promise.reject();
     }
-        };
+}
-    } else {
+
-        // Use our own dialog
+function customConfirm(text, title) {
-        return (text, title) => {
     let options;
     if (typeof text === 'string') {
         options = {
@@ -63,7 +58,8 @@ export default (() => {
 
         return Promise.reject();
     });
-        };
 }
-})();
+
-/* eslint-enable indent */
+const baseConfirm = browser.tv && window.confirm ? nativeConfirm : customConfirm;
+
+export default baseConfirm;

src/components/directorybrowser/directorybrowser.js

@@ -8,6 +8,7 @@ import '../../elements/emby-button/paper-icon-button-light';
 import './directorybrowser.css';
 import '../formdialog.css';
 import '../../elements/emby-button/emby-button';
+import alert from '../alert';
 
 /* eslint-disable indent */
 
@@ -157,9 +158,7 @@ import '../../elements/emby-button/emby-button';
     }
 
     function alertTextWithOptions(options) {
-        import('../alert').then((alert) => {
         alert(options);
-        });
     }
 
     function validatePath(path, validateWriteable, apiClient) {

src/components/imageeditor/imageeditor.js

@@ -14,6 +14,8 @@ import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
 import './imageeditor.css';
 import ServerConnections from '../ServerConnections';
+import alert from '../alert';
+import confirm from '../confirm/confirm';
 
 /* eslint-disable indent */
 
@@ -200,15 +202,11 @@ import ServerConnections from '../ServerConnections';
             return;
         }
 
-        import('../confirm/confirm').then(({default: confirm}) => {
         confirm({
-
             text: globalize.translate('ConfirmDeleteImage'),
             confirmText: globalize.translate('Delete'),
             primary: 'delete'
-
         }).then(afterConfirm);
-        });
     }
 
     function moveImage(context, apiClient, itemId, type, index, newIndex, focusContext) {
@@ -216,10 +214,8 @@ import ServerConnections from '../ServerConnections';
             hasChanges = true;
             reload(context, null, focusContext);
         }, function () {
-            import('../alert').then((alert) => {
             alert(globalize.translate('ErrorDefault'));
         });
-        });
     }
 
     function renderImages(page, item, apiClient, images, imageProviders, elem) {

src/components/mediaLibraryCreator/mediaLibraryCreator.js

@@ -20,6 +20,7 @@ import '../listview/listview.css';
 import '../formdialog.css';
 import '../../assets/css/flexstyles.css';
 import toast from '../toast/toast';
+import alert from '../alert';
 
     function onAddLibrary() {
         if (isCreating) {
@@ -27,12 +28,10 @@ import toast from '../toast/toast';
         }
 
         if (pathInfos.length == 0) {
-            import('../alert').then((alert) => {
             alert({
                 text: globalize.translate('PleaseAddAtLeastOneFolder'),
                 type: 'error'
             });
-            });
 
             return false;
         }

src/components/mediaLibraryEditor/mediaLibraryEditor.js

@@ -18,6 +18,7 @@ import '../formdialog.css';
 import '../../elements/emby-toggle/emby-toggle';
 import '../../assets/css/flexstyles.css';
 import toast from '../toast/toast';
+import confirm from '../confirm/confirm';
 
     function onEditLibrary() {
         if (isCreating) {
@@ -69,7 +70,6 @@ import toast from '../toast/toast';
         const button = btnRemovePath;
         const virtualFolder = currentOptions.library;
 
-        import('../confirm/confirm').then(({default: confirm}) => {
         confirm({
             title: globalize.translate('HeaderRemoveMediaLocation'),
             text: globalize.translate('MessageConfirmRemoveMediaLocation'),
@@ -84,7 +84,6 @@ import toast from '../toast/toast';
                 toast(globalize.translate('ErrorDefault'));
             });
         });
-        });
     }
 
     function onListItemClick(e) {

src/components/metadataEditor/metadataEditor.js

@@ -17,6 +17,7 @@ import '../formdialog.css';
 import '../../assets/css/clearbutton.css';
 import '../../assets/css/flexstyles.css';
 import ServerConnections from '../ServerConnections';
+import toast from '../toast/toast';
 
 /* eslint-disable indent */
 
@@ -36,9 +37,7 @@ import ServerConnections from '../ServerConnections';
 
     function submitUpdatedItem(form, item) {
         function afterContentTypeUpdated() {
-            import('../toast/toast').then(({default: toast}) => {
             toast(globalize.translate('MessageItemSaved'));
-            });
 
             loading.hide();
             closeDialog(true);

src/components/multiSelect/multiSelect.js

@@ -5,6 +5,9 @@ import globalize from '../../scripts/globalize';
 import dom from '../../scripts/dom';
 import './multiSelect.css';
 import ServerConnections from '../ServerConnections';
+import alert from '../alert';
+import playlistEditor from '../playlisteditor/playlisteditor';
+import confirm from '../confirm/confirm';
 
 /* eslint-disable indent */
 
@@ -138,11 +141,9 @@ import ServerConnections from '../ServerConnections';
     }
 
     function alertText(options) {
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve) => {
-            import('../alert').then((alert) => {
             alert(options).then(resolve, resolve);
         });
-        });
     }
 
     function deleteItems(apiClient, itemIds) {
@@ -155,7 +156,6 @@ import ServerConnections from '../ServerConnections';
                 title = globalize.translate('HeaderDeleteItems');
             }
 
-            import('../confirm/confirm').then((confirm) => {
             confirm(msg, title).then(() => {
                 const promises = itemIds.map(itemId => {
                     apiClient.deleteItem(itemId);
@@ -166,7 +166,6 @@ import ServerConnections from '../ServerConnections';
                 });
             }, reject);
         });
-        });
     }
 
     function showMenuForSelectedItems(e) {
@@ -318,12 +317,9 @@ import ServerConnections from '../ServerConnections';
 
     function combineVersions(apiClient, selection) {
         if (selection.length < 2) {
-            import('../alert').then((alert) => {
             alert({
-
                 text: globalize.translate('PleaseSelectTwoItems')
             });
-            });
             return;
         }
 

src/components/playback/playbackmanager.js

@@ -10,6 +10,7 @@ import loading from '../loading/loading';
 import { appHost } from '../apphost';
 import * as Screenfull from 'screenfull';
 import ServerConnections from '../ServerConnections';
+import alert from '../alert';
 
 function enableLocalPlaylistManagement(player) {
     if (player.getPlaylist) {
@@ -648,12 +649,10 @@ function validatePlaybackInfoResult(instance, result) {
 }
 
 function showPlaybackInfoErrorMessage(instance, errorCode) {
-    import('../alert').then(({ default: alert }) => {
     alert({
         text: globalize.translate(errorCode),
         title: globalize.translate('HeaderPlaybackError')
     });
-    });
 }
 
 function normalizePlayOptions(playOptions) {

src/components/playbackSettings/playbackSettings.js

@@ -9,6 +9,7 @@ import { Events } from 'jellyfin-apiclient';
 import '../../elements/emby-select/emby-select';
 import '../../elements/emby-checkbox/emby-checkbox';
 import ServerConnections from '../ServerConnections';
+import toast from '../toast/toast';
 
 /* eslint-disable indent */
 
@@ -244,9 +245,7 @@ import ServerConnections from '../ServerConnections';
             saveUser(context, user, userSettings, apiClient).then(() => {
                 loading.hide();
                 if (enableSaveConfirmation) {
-                    import('../toast/toast').then((toast) => {
                     toast(globalize.translate('SettingsSaved'));
-                    });
                 }
 
                 Events.trigger(instance, 'saved');

src/components/recordingcreator/recordingfields.js

@@ -9,6 +9,7 @@ import '../../elements/emby-button/paper-icon-button-light';
 import './recordingfields.css';
 import '../../assets/css/flexstyles.css';
 import ServerConnections from '../ServerConnections';
+import toast from '../toast/toast';
 
 /*eslint prefer-const: "error"*/
 
@@ -226,9 +227,7 @@ function onRecordChange(e) {
 }
 
 function sendToast(msg) {
-    import('../toast/toast').then((toast) => {
     toast(msg);
-    });
 }
 
 function onRecordSeriesChange(e) {

src/components/recordingcreator/recordinghelper.js

@@ -1,6 +1,8 @@
 import globalize from '../../scripts/globalize';
 import loading from '../loading/loading';
 import ServerConnections from '../ServerConnections';
+import toast from '../toast/toast';
+import confirm from '../confirm/confirm';
 
 /*eslint prefer-const: "error"*/
 
@@ -29,7 +31,6 @@ function changeRecordingToSeries(apiClient, timerId, programId, confirmTimerCanc
 
 function cancelTimerWithConfirmation(timerId, serverId) {
     return new Promise(function (resolve, reject) {
-        import('../confirm/confirm').then((confirm) => {
         confirm.default({
 
             text: globalize.translate('MessageConfirmRecordingCancellation'),
@@ -44,12 +45,10 @@ function cancelTimerWithConfirmation(timerId, serverId) {
             cancelTimer(apiClient, timerId, true).then(resolve, reject);
         }, reject);
     });
-    });
 }
 
 function cancelSeriesTimerWithConfirmation(timerId, serverId) {
     return new Promise(function (resolve, reject) {
-        import('../confirm/confirm').then((confirm) => {
         confirm.default({
 
             text: globalize.translate('MessageConfirmRecordingCancellation'),
@@ -62,16 +61,13 @@ function cancelSeriesTimerWithConfirmation(timerId, serverId) {
 
             const apiClient = ServerConnections.getApiClient(serverId);
             apiClient.cancelLiveTvSeriesTimer(timerId).then(function () {
-                    import('../toast/toast').then((toast) => {
                 toast(globalize.translate('SeriesCancelled'));
-                    });
 
                 loading.hide();
                 resolve();
             }, reject);
         }, reject);
     });
-    });
 }
 
 function cancelTimer(apiClient, timerId, hideLoading) {
@@ -99,9 +95,7 @@ function createRecording(apiClient, programId, isSeries) {
 }
 
 function sendToast(msg) {
-    import('../toast/toast').then((toast) => {
     toast(msg);
-    });
 }
 
 function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus, seriesTimerId) {
@@ -151,10 +145,7 @@ function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus,
                     loading.show();
 
                     apiClient.cancelLiveTvSeriesTimer(seriesTimerId).then(function () {
-                        import('../toast/toast').then((toast) => {
                         toast(globalize.translate('SeriesCancelled'));
-                        });
-
                         loading.hide();
                         resolve();
                     }, reject);

src/components/refreshdialog/refreshdialog.js

@@ -11,6 +11,7 @@ import '../../elements/emby-select/emby-select';
 import 'material-design-icons-iconfont';
 import '../formdialog.css';
 import ServerConnections from '../ServerConnections';
+import toast from '../toast/toast';
 
 /*eslint prefer-const: "error"*/
 
@@ -86,9 +87,7 @@ function onSubmit(e) {
 
     dialogHelper.close(dlg);
 
-    import('../toast/toast').then((toast) => {
     toast(globalize.translate('RefreshQueued'));
-    });
 
     loading.hide();
 

src/components/remotecontrol/remotecontrol.js

@@ -16,6 +16,7 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
 import './remotecontrol.css';
 import '../../elements/emby-ratingbutton/emby-ratingbutton';
 import ServerConnections from '../ServerConnections';
+import toast from '../toast/toast';
 
 /*eslint prefer-const: "error"*/
 
@@ -864,9 +865,7 @@ export default function () {
         }, currentPlayer);
         form.querySelector('input').value = '';
 
-        import('../toast/toast').then((toast) => {
         toast('Message sent.');
-        });
 
         e.preventDefault();
         e.stopPropagation();
@@ -883,9 +882,7 @@ export default function () {
         }, currentPlayer);
         form.querySelector('input').value = '';
 
-        import('../toast/toast').then((toast) => {
         toast('Text sent.');
-        });
 
         e.preventDefault();
         e.stopPropagation();

src/components/subtitleeditor/subtitleeditor.js

@@ -15,6 +15,8 @@ import './subtitleeditor.css';
 import '../../elements/emby-button/emby-button';
 import '../../assets/css/flexstyles.css';
 import ServerConnections from '../ServerConnections';
+import toast from '../toast/toast';
+import confirm from '../confirm/confirm';
 
 let currentItem;
 let hasChanges;
@@ -31,9 +33,7 @@ function downloadRemoteSubtitles(context, id) {
     }).then(function () {
         hasChanges = true;
 
-        import('../toast/toast').then((toast) => {
         toast(globalize.translate('MessageDownloadQueued'));
-        });
 
         focusManager.autoFocus(context);
     });
@@ -42,7 +42,6 @@ function downloadRemoteSubtitles(context, id) {
 function deleteLocalSubtitle(context, index) {
     const msg = globalize.translate('MessageAreYouSureDeleteSubtitles');
 
-    import('../confirm/confirm').then((confirm) => {
     confirm({
 
         title: globalize.translate('ConfirmDeletion'),
@@ -68,7 +67,6 @@ function deleteLocalSubtitle(context, index) {
             reload(context, apiClient, itemId);
         });
     });
-    });
 }
 
 function fillSubtitleList(context, item) {

src/components/subtitlesettings/subtitlesettings.js

@@ -16,6 +16,7 @@ import '../../elements/emby-checkbox/emby-checkbox';
 import '../../assets/css/flexstyles.css';
 import './subtitlesettings.css';
 import ServerConnections from '../ServerConnections';
+import toast from '../toast/toast';
 
 /**
  * Subtitle settings.
@@ -88,9 +89,7 @@ function save(instance, context, userId, userSettings, apiClient, enableSaveConf
         saveUser(context, user, userSettings, instance.appearanceKey, apiClient).then(function () {
             loading.hide();
             if (enableSaveConfirmation) {
-                import('../toast/toast').then((toast) => {
                 toast(globalize.translate('SettingsSaved'));
-                });
             }
 
             Events.trigger(instance, 'saved');

src/controllers/dashboard/apikeys.js

@@ -3,11 +3,11 @@ import loading from '../../components/loading/loading';
 import dom from '../../scripts/dom';
 import globalize from '../../scripts/globalize';
 import '../../elements/emby-button/emby-button';
+import confirm from '../../components/confirm/confirm';
 
 /* eslint-disable indent */
 
     function revoke(page, key) {
-        import('../../components/confirm/confirm').then(({default: confirm}) => {
         confirm(globalize.translate('MessageConfirmRevokeApiKey'), globalize.translate('HeaderConfirmRevokeApiKey')).then(function () {
             loading.show();
             ApiClient.ajax({
@@ -17,7 +17,6 @@ import '../../elements/emby-button/emby-button';
                 loadData(page);
             });
         });
-        });
     }
 
     function renderKeys(page, keys) {

src/controllers/dashboard/dashboard.js

@@ -20,11 +20,12 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
 import taskButton from '../../scripts/taskbutton';
 import Dashboard from '../../scripts/clientUtils';
 import ServerConnections from '../../components/ServerConnections';
+import alert from '../../components/alert';
+import confirm from '../../components/confirm/confirm';
 
 /* eslint-disable indent */
 
     function showPlaybackInfo(btn, session) {
-        import('../../components/alert').then(({default: alert}) => {
         let title;
         const text = [];
         const displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session);
@@ -51,7 +52,6 @@ import ServerConnections from '../../components/ServerConnections';
             text: text.join('<br/>'),
             title: title
         });
-        });
     }
 
     function showSendMessageForm(btn, session) {
@@ -722,7 +722,6 @@ import ServerConnections from '../../components/ServerConnections';
             });
         },
         restart: function (btn) {
-            import('../../components/confirm/confirm').then(({default: confirm}) => {
             confirm({
                 title: globalize.translate('Restart'),
                 text: globalize.translate('MessageConfirmRestart'),
@@ -734,10 +733,8 @@ import ServerConnections from '../../components/ServerConnections';
                 page.querySelector('#btnShutdown').disabled = true;
                 ApiClient.restartServer();
             });
-            });
         },
         shutdown: function (btn) {
-            import('../../components/confirm/confirm').then(({default: confirm}) => {
             confirm({
                 title: globalize.translate('ButtonShutdown'),
                 text: globalize.translate('MessageConfirmShutdown'),
@@ -749,7 +746,6 @@ import ServerConnections from '../../components/ServerConnections';
                 page.querySelector('#btnShutdown').disabled = true;
                 ApiClient.shutdownServer();
             });
-            });
         }
     };
     export default function (view, params) {

src/controllers/dashboard/devices/devices.js

@@ -8,6 +8,7 @@ import '../../../elements/emby-button/emby-button';
 import '../../../elements/emby-itemscontainer/emby-itemscontainer';
 import '../../../components/cardbuilder/card.css';
 import Dashboard from '../../../scripts/clientUtils';
+import confirm from '../../../components/confirm/confirm';
 
 /* eslint-disable indent */
 
@@ -40,7 +41,6 @@ import Dashboard from '../../../scripts/clientUtils';
     function deleteDevice(page, id) {
         const msg = globalize.translate('DeleteDeviceConfirmation');
 
-        import('../../../components/confirm/confirm').then(({default: confirm}) => {
         confirm({
             text: msg,
             title: globalize.translate('HeaderDeleteDevice'),
@@ -51,7 +51,6 @@ import Dashboard from '../../../scripts/clientUtils';
             await ApiClient.deleteDevice(id);
             loadData(page);
         });
-        });
     }
 
     function showDeviceMenu(view, btn, deviceId) {

src/controllers/dashboard/dlna/profile.js

@@ -7,6 +7,7 @@ import '../../../elements/emby-input/emby-input';
 import '../../../elements/emby-checkbox/emby-checkbox';
 import '../../../components/listview/listview.css';
 import Dashboard from '../../../scripts/clientUtils';
+import toast from '../../../components/toast/toast';
 
 /* eslint-disable indent */
 
@@ -634,9 +635,7 @@ import Dashboard from '../../../scripts/clientUtils';
                 data: JSON.stringify(profile),
                 contentType: 'application/json'
             }).then(function () {
-                import('../../../components/toast/toast').then((toast) => {
                 toast('Settings saved.');
-                });
             }, Dashboard.processErrorResponse);
         } else {
             ApiClient.ajax({

src/controllers/dashboard/dlna/profiles.js

@@ -4,6 +4,7 @@ import loading from '../../../components/loading/loading';
 import libraryMenu from '../../../scripts/libraryMenu';
 import '../../../components/listview/listview.css';
 import '../../../elements/emby-button/emby-button';
+import confirm from '../../../components/confirm/confirm';
 
 /* eslint-disable indent */
 
@@ -64,7 +65,6 @@ import '../../../elements/emby-button/emby-button';
     }
 
     function deleteProfile(page, id) {
-        import('../../../components/confirm/confirm').then(({default: confirm}) => {
         confirm(globalize.translate('MessageConfirmProfileDeletion'), globalize.translate('HeaderConfirmProfileDeletion')).then(function () {
             loading.show();
             ApiClient.ajax({
@@ -75,7 +75,6 @@ import '../../../elements/emby-button/emby-button';
                 loadProfiles(page);
             });
         });
-        });
     }
 
     function getTabs() {

src/controllers/dashboard/encodingsettings.js

@@ -4,6 +4,7 @@ import globalize from '../../scripts/globalize';
 import dom from '../../scripts/dom';
 import libraryMenu from '../../scripts/libraryMenu';
 import Dashboard from '../../scripts/clientUtils';
+import alert from '../../components/alert';
 
 /* eslint-disable indent */
 
@@ -43,12 +44,7 @@ import Dashboard from '../../scripts/clientUtils';
 
     function onSaveEncodingPathFailure(response) {
         loading.hide();
-        let msg = '';
+        alert(globalize.translate('FFmpegSavePathNotFound'));
-        msg = globalize.translate('FFmpegSavePathNotFound');
-
-        import('../../components/alert').then(({default: alert}) => {
-            alert(msg);
-        });
     }
 
     function updateEncoder(form) {
@@ -102,22 +98,17 @@ import Dashboard from '../../scripts/clientUtils';
                 ApiClient.updateNamedConfiguration('encoding', config).then(function () {
                     updateEncoder(form);
                 }, function () {
-                    import('../../components/alert').then(({default: alert}) => {
                     alert(globalize.translate('ErrorDefault'));
-                    });
-
                     Dashboard.processServerConfigurationUpdateResult();
                 });
             });
         };
 
         if ($('#selectVideoDecoder', form).val()) {
-            import('../../components/alert').then(({default: alert}) => {
             alert({
                 title: globalize.translate('TitleHardwareAcceleration'),
                 text: globalize.translate('HardwareAccelerationWarning')
             }).then(onDecoderConfirmed);
-            });
         } else {
             onDecoderConfirmed();
         }

src/controllers/dashboard/general.js

@@ -8,6 +8,7 @@ import '../../elements/emby-select/emby-select';
 import '../../elements/emby-button/emby-button';
 import AppInfo from '../../components/AppInfo';
 import Dashboard from '../../scripts/clientUtils';
+import alert from '../../components/alert';
 
 /* eslint-disable indent */
 
@@ -53,10 +54,7 @@ import Dashboard from '../../scripts/clientUtils';
                     });
                 });
             }, function () {
-                import('../../components/alert').then(({default: alert}) => {
                 alert(globalize.translate('ErrorDefault'));
-                });
-
                 Dashboard.processServerConfigurationUpdateResult();
             });
         });

src/controllers/dashboard/library.js

@@ -8,6 +8,7 @@ import imageHelper from '../../scripts/imagehelper';
 import '../../components/cardbuilder/card.css';
 import '../../elements/emby-itemrefreshindicator/emby-itemrefreshindicator';
 import Dashboard from '../../scripts/clientUtils';
+import confirm from '../../components/confirm/confirm';
 
 /* eslint-disable indent */
 
@@ -47,7 +48,6 @@ import Dashboard from '../../scripts/clientUtils';
             msg += virtualFolder.Locations.join('<br/>');
         }
 
-        import('../../components/confirm/confirm').then((confirm) => {
         confirm({
             text: msg,
             title: globalize.translate('HeaderRemoveMediaFolder'),
@@ -59,7 +59,6 @@ import Dashboard from '../../scripts/clientUtils';
                 reloadLibrary(page);
             });
         });
-        });
     }
 
     function refreshVirtualFolder(page, virtualFolder) {

src/controllers/dashboard/metadatanfo.js

@@ -3,6 +3,7 @@ import loading from '../../components/loading/loading';
 import libraryMenu from '../../scripts/libraryMenu';
 import globalize from '../../scripts/globalize';
 import Dashboard from '../../scripts/clientUtils';
+import alert from '../../components/alert';
 
 /* eslint-disable indent */
 
@@ -39,12 +40,9 @@ import Dashboard from '../../scripts/clientUtils';
     function showConfirmMessage(config) {
         const msg = [];
         msg.push(globalize.translate('MetadataSettingChangeHelp'));
-
-        import('../../components/alert').then(({default: alert}) => {
         alert({
             text: msg.join('<br/><br/>')
         });
-        });
     }
 
     function getTabs() {

src/controllers/dashboard/networking.js

@@ -3,6 +3,7 @@ import globalize from '../../scripts/globalize';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-select/emby-select';
 import Dashboard from '../../scripts/clientUtils';
+import alert from '../../components/alert';
 
 /* eslint-disable indent */
 
@@ -90,10 +91,8 @@ import Dashboard from '../../scripts/clientUtils';
 
     function showAlertText(options) {
         return new Promise(function (resolve, reject) {
-            import('../../components/alert').then(({default: alert}) => {
             alert(options).then(resolve, reject);
         });
-        });
     }
 
     function confirmSelections(localAddress, enableUpnp, callback) {

src/controllers/dashboard/plugins/add/index.js

@@ -3,6 +3,8 @@ import loading from '../../../../components/loading/loading';
 import globalize from '../../../../scripts/globalize';
 import '../../../../elements/emby-button/emby-button';
 import Dashboard from '../../../../scripts/clientUtils';
+import alert from '../../../../components/alert';
+import confirm from '../../../../components/confirm/confirm';
 
 function populateHistory(packageInfo, page) {
     let html = '';
@@ -69,9 +71,7 @@ function renderPackage(pkg, installedPlugins, page) {
 }
 
 function alertText(options) {
-    import('../../../../components/alert').then(({default: alert}) => {
     alert(options);
-    });
 }
 
 function performInstallation(page, name, guid, version) {
@@ -95,13 +95,11 @@ function performInstallation(page, name, guid, version) {
         msg += '<br/>';
         msg += globalize.translate('PleaseConfirmPluginInstallation');
 
-        import('../../../../components/confirm/confirm').then(({default: confirm}) => {
         confirm(msg, globalize.translate('HeaderConfirmPluginInstallation')).then(function () {
             alertCallback();
         }).catch(() => {
             console.debug('plugin not installed');
         });
-        });
     } else {
         alertCallback();
     }

src/controllers/dashboard/plugins/installed/index.js

@@ -5,11 +5,11 @@ import globalize from '../../../../scripts/globalize';
 import '../../../../components/cardbuilder/card.css';
 import '../../../../elements/emby-button/emby-button';
 import Dashboard from '../../../../scripts/clientUtils';
+import confirm from '../../../../components/confirm/confirm';
 
 function deletePlugin(page, uniqueid, name) {
     const msg = globalize.translate('UninstallPluginConfirmation', name);
 
-    import('../../../../components/confirm/confirm').then((confirm) => {
     confirm.default({
         title: globalize.translate('HeaderUninstallPlugin'),
         text: msg,
@@ -21,7 +21,6 @@ function deletePlugin(page, uniqueid, name) {
             reloadList(page);
         });
     });
-    });
 }
 
 function showNoConfigurationMessage() {

src/controllers/dashboard/scheduledtasks/scheduledtask.js

@@ -6,6 +6,7 @@ import globalize from '../../../scripts/globalize';
 import '../../../elements/emby-input/emby-input';
 import '../../../elements/emby-button/emby-button';
 import '../../../elements/emby-select/emby-select';
+import confirm from '../../../components/confirm/confirm';
 
 /* eslint-disable indent */
 
@@ -135,11 +136,9 @@ import '../../../elements/emby-select/emby-select';
             $('#popupAddTrigger', view).removeClass('hide');
         },
         confirmDeleteTrigger: function (view, index) {
-            import('../../../components/confirm/confirm').then(({default: confirm}) => {
             confirm(globalize.translate('MessageDeleteTaskTrigger'), globalize.translate('HeaderDeleteTaskTrigger')).then(function () {
                 ScheduledTaskPage.deleteTrigger(view, index);
             });
-            });
         },
         deleteTrigger: function (view, index) {
             loading.show();

src/controllers/dashboard/users/useredit.js

@@ -3,6 +3,7 @@ import loading from '../../../components/loading/loading';
 import libraryMenu from '../../../scripts/libraryMenu';
 import globalize from '../../../scripts/globalize';
 import Dashboard from '../../../scripts/clientUtils';
+import toast from '../../../components/toast/toast';
 
 /* eslint-disable indent */
 
@@ -110,10 +111,7 @@ import Dashboard from '../../../scripts/clientUtils';
     function onSaveComplete(page, user) {
         Dashboard.navigate('userprofiles.html');
         loading.hide();
-
-        import('../../../components/toast/toast').then((toast) => {
         toast(globalize.translate('SettingsSaved'));
-        });
     }
 
     function saveUser(user, page) {

src/controllers/dashboard/users/userlibraryaccess.js

@@ -3,6 +3,7 @@ import loading from '../../../components/loading/loading';
 import libraryMenu from '../../../scripts/libraryMenu';
 import globalize from '../../../scripts/globalize';
 import Dashboard from '../../../scripts/clientUtils';
+import toast from '../../../components/toast/toast';
 
 /* eslint-disable indent */
 
@@ -92,10 +93,7 @@ import Dashboard from '../../../scripts/clientUtils';
 
     function onSaveComplete(page) {
         loading.hide();
-
-        import('../../../components/toast/toast').then((toast) => {
         toast(globalize.translate('SettingsSaved'));
-        });
     }
 
     function saveUser(user, page) {

src/controllers/dashboard/users/usernew.js

@@ -3,6 +3,7 @@ import loading from '../../../components/loading/loading';
 import globalize from '../../../scripts/globalize';
 import '../../../elements/emby-checkbox/emby-checkbox';
 import Dashboard from '../../../scripts/clientUtils';
+import toast from '../../../components/toast/toast';
 
 /* eslint-disable indent */
 
@@ -89,10 +90,7 @@ import Dashboard from '../../../scripts/clientUtils';
                 Dashboard.navigate('useredit.html?userId=' + user.Id);
             });
         }, function (response) {
-            import('../../../components/toast/toast').then((toast) => {
             toast(globalize.translate('ErrorDefault'));
-            });
-
             loading.hide();
         });
     }

src/controllers/dashboard/users/userparentalcontrol.js

@@ -5,6 +5,7 @@ import libraryMenu from '../../../scripts/libraryMenu';
 import globalize from '../../../scripts/globalize';
 import '../../../components/listview/listview.css';
 import '../../../elements/emby-button/paper-icon-button-light';
+import toast from '../../../components/toast/toast';
 
 /* eslint-disable indent */
 
@@ -162,10 +163,7 @@ import '../../../elements/emby-button/paper-icon-button-light';
 
     function onSaveComplete(page) {
         loading.hide();
-
-        import('../../../components/toast/toast').then((toast) => {
         toast(globalize.translate('SettingsSaved'));
-        });
     }
 
     function saveUser(user, page) {

src/controllers/dashboard/users/userpasswordpage.js

@@ -3,6 +3,8 @@ import libraryMenu from '../../../scripts/libraryMenu';
 import globalize from '../../../scripts/globalize';
 import '../../../elements/emby-button/emby-button';
 import Dashboard from '../../../scripts/clientUtils';
+import toast from '../../../components/toast/toast';
+import confirm from '../../../components/confirm/confirm';
 
 /* eslint-disable indent */
 
@@ -82,10 +84,7 @@ import Dashboard from '../../../scripts/clientUtils';
                 user.Configuration.EnableLocalPassword = view.querySelector('.chkEnableLocalEasyPassword').checked;
                 ApiClient.updateUserConfiguration(user.Id, user.Configuration).then(function () {
                     loading.hide();
-
-                    import('../../../components/toast/toast').then((toast) => {
                     toast(globalize.translate('SettingsSaved'));
-                    });
 
                     loadUser(view, params);
                 });
@@ -105,10 +104,7 @@ import Dashboard from '../../../scripts/clientUtils';
 
             ApiClient.updateUserPassword(userId, currentPassword, newPassword).then(function () {
                 loading.hide();
-
-                import('../../../components/toast/toast').then((toast) => {
                 toast(globalize.translate('PasswordSaved'));
-                });
 
                 loadUser(view, params);
             }, function () {
@@ -124,9 +120,7 @@ import Dashboard from '../../../scripts/clientUtils';
             const form = this;
 
             if (form.querySelector('#txtNewPassword').value != form.querySelector('#txtNewPasswordConfirm').value) {
-                import('../../../components/toast/toast').then((toast) => {
                 toast(globalize.translate('PasswordMatchError'));
-                });
             } else {
                 loading.show();
                 savePassword();
@@ -145,7 +139,6 @@ import Dashboard from '../../../scripts/clientUtils';
 
         function resetPassword() {
             const msg = globalize.translate('PasswordResetConfirmation');
-            import('../../../components/confirm/confirm').then(({default: confirm}) => {
             confirm(msg, globalize.translate('ResetPassword')).then(function () {
                 const userId = params.userId;
                 loading.show();
@@ -158,13 +151,11 @@ import Dashboard from '../../../scripts/clientUtils';
                     loadUser(view, params);
                 });
             });
-            });
         }
 
         function resetEasyPassword() {
             const msg = globalize.translate('PinCodeResetConfirmation');
 
-            import('../../../components/confirm/confirm').then(({default: confirm}) => {
             confirm(msg, globalize.translate('HeaderPinCodeReset')).then(function () {
                 const userId = params.userId;
                 loading.show();
@@ -177,7 +168,6 @@ import Dashboard from '../../../scripts/clientUtils';
                     loadUser(view, params);
                 });
             });
-            });
         }
 
         view.querySelector('.updatePasswordForm').addEventListener('submit', onSubmit);

src/controllers/dashboard/users/userprofilespage.js

@@ -9,13 +9,13 @@ import '../../../elements/emby-button/emby-button';
 import '../../../components/indicators/indicators.css';
 import '../../../assets/css/flexstyles.css';
 import Dashboard from '../../../scripts/clientUtils';
+import confirm from '../../../components/confirm/confirm';
 
 /* eslint-disable indent */
 
     function deleteUser(page, id) {
         const msg = globalize.translate('DeleteUserConfirmation');
 
-        import('../../../components/confirm/confirm').then(({default: confirm}) => {
         confirm({
             title: globalize.translate('DeleteUser'),
             text: msg,
@@ -27,7 +27,6 @@ import Dashboard from '../../../scripts/clientUtils';
                 loadData(page);
             });
         });
-        });
     }
 
     function showUserMenu(elem) {

src/controllers/itemDetails/index.js

@@ -29,6 +29,7 @@ import '../../elements/emby-select/emby-select';
 import itemShortcuts from '../../components/shortcuts';
 import Dashboard from '../../scripts/clientUtils';
 import ServerConnections from '../../components/ServerConnections';
+import confirm from '../../components/confirm/confirm';
 
 function getPromise(apiClient, params) {
     const id = params.id;
@@ -1869,7 +1870,6 @@ export default function (view, params) {
     }
 
     function splitVersions(instance, page, apiClient, params) {
-        import('../../components/confirm/confirm').then(({ default: confirm }) => {
         confirm('Are you sure you wish to split the media sources into separate items?', 'Split Media Apart').then(function () {
             loading.show();
             apiClient.ajax({
@@ -1880,7 +1880,6 @@ export default function (view, params) {
                 reload(instance, page, params);
             });
         });
-        });
     }
 
     function getPlayOptions(startPosition) {

src/controllers/livetvsettings.js

@@ -3,6 +3,7 @@ import loading from '../components/loading/loading';
 import globalize from '../scripts/globalize';
 import '../elements/emby-button/emby-button';
 import Dashboard from '../scripts/clientUtils';
+import alert from '../components/alert';
 
 function loadPage(page, config) {
     $('.liveTvSettingsForm', page).show();
@@ -51,9 +52,7 @@ function showSaveMessage(recordingPathChanged) {
     }
 
     if (msg) {
-        import('../components/alert').then(({default: alert}) => {
         alert(msg);
-        });
     }
 }
 

src/controllers/livetvstatus.js

@@ -12,6 +12,7 @@ import '../components/cardbuilder/card.css';
 import 'material-design-icons-iconfont';
 import '../elements/emby-button/emby-button';
 import Dashboard from '../scripts/clientUtils';
+import confirm from '../components/confirm/confirm';
 
 const enableFocusTransform = !browser.slow && !browser.edge;
 
@@ -57,7 +58,6 @@ function renderDevices(page, devices) {
 function deleteDevice(page, id) {
     const message = globalize.translate('MessageConfirmDeleteTunerDevice');
 
-    import('../components/confirm/confirm').then(({default: confirm}) => {
     confirm(message, globalize.translate('HeaderDeleteDevice')).then(function () {
         loading.show();
         ApiClient.ajax({
@@ -69,7 +69,6 @@ function deleteDevice(page, id) {
             reload(page);
         });
     });
-    });
 }
 
 function reload(page) {
@@ -175,7 +174,6 @@ function mapChannels(page, providerId) {
 function deleteProvider(page, id) {
     const message = globalize.translate('MessageConfirmDeleteGuideProvider');
 
-    import('../components/confirm/confirm').then(({default: confirm}) => {
     confirm(message, globalize.translate('HeaderDeleteProvider')).then(function () {
         loading.show();
         ApiClient.ajax({
@@ -189,7 +187,6 @@ function deleteProvider(page, id) {
             reload(page);
         });
     });
-    });
 }
 
 function getTunerName(providerId) {

src/controllers/session/login/index.js

@@ -10,6 +10,7 @@ import '../../../components/cardbuilder/card.css';
 import '../../../elements/emby-checkbox/emby-checkbox';
 import Dashboard from '../../../scripts/clientUtils';
 import ServerConnections from '../../../components/ServerConnections';
+import toast from '../../../components/toast/toast';
 
 /* eslint-disable indent */
 
@@ -29,10 +30,8 @@ import ServerConnections from '../../../components/ServerConnections';
 
             const UnauthorizedOrForbidden = [401, 403];
             if (UnauthorizedOrForbidden.includes(response.status)) {
-                import('../../../components/toast/toast').then((toast) => {
                 const messageKey = response.status === 401 ? 'MessageInvalidUser' : 'MessageUnauthorizedUser';
                 toast(globalize.translate(messageKey));
-                });
             } else {
                 Dashboard.alert({
                     message: globalize.translate('MessageUnableToConnectToServer'),

src/controllers/session/selectServer/index.js

@@ -16,6 +16,7 @@ import '../../../components/cardbuilder/card.css';
 import '../../../elements/emby-button/emby-button';
 import Dashboard from '../../../scripts/clientUtils';
 import ServerConnections from '../../../components/ServerConnections';
+import alert from '../../../components/alert';
 
 /* eslint-disable indent */
 
@@ -102,9 +103,7 @@ import ServerConnections from '../../../components/ServerConnections';
     }
 
     function alertTextWithOptions(options) {
-        import('../../../components/alert').then(({default: alert}) => {
         alert(options);
-        });
     }
 
     function showServerConnectionFailure() {

src/controllers/user/profile/index.js

@@ -5,6 +5,8 @@ import { appHost } from '../../../components/apphost';
 import globalize from '../../../scripts/globalize';
 import '../../../elements/emby-button/emby-button';
 import Dashboard from '../../../scripts/clientUtils';
+import toast from '../../../components/toast/toast';
+import confirm from '../../../components/confirm/confirm';
 
 function reloadUser(page) {
     const userId = getParameterByName('userId');
@@ -41,26 +43,20 @@ function onFileReaderError(evt) {
     loading.hide();
     switch (evt.target.error.code) {
         case evt.target.error.NOT_FOUND_ERR:
-            import('../../../components/toast/toast').then((toast) => {
             toast(globalize.translate('FileNotFound'));
-            });
             break;
         case evt.target.error.ABORT_ERR:
             onFileReaderAbort();
             break;
         case evt.target.error.NOT_READABLE_ERR:
         default:
-            import('../../../components/toast/toast').then((toast) => {
             toast(globalize.translate('FileReadError'));
-            });
     }
 }
 
 function onFileReaderAbort(evt) {
     loading.hide();
-    import('../../../components/toast/toast').then((toast) => {
     toast(globalize.translate('FileReadCancelled'));
-    });
 }
 
 function setFiles(page, files) {
@@ -90,7 +86,6 @@ export default function (view, params) {
     reloadUser(view);
     new UserPasswordPage(view, params);
     view.querySelector('#btnDeleteImage').addEventListener('click', function () {
-        import('../../../components/confirm/confirm').then(({default: confirm}) => {
         confirm(globalize.translate('DeleteImageConfirmation'), globalize.translate('DeleteImage')).then(function () {
             loading.show();
             const userId = getParameterByName('userId');
@@ -100,7 +95,6 @@ export default function (view, params) {
             });
         });
     });
-    });
     view.querySelector('#btnAddImage').addEventListener('click', function (evt) {
         view.querySelector('#uploadImage').click();
     });

src/controllers/wizard/user/index.js

@@ -4,6 +4,7 @@ import '../../../assets/css/dashboard.css';
 import '../../../elements/emby-input/emby-input';
 import '../../../elements/emby-button/emby-button';
 import Dashboard from '../../../scripts/clientUtils';
+import toast from '../../../components/toast/toast';
 
 function getApiClient() {
     return ApiClient;
@@ -37,9 +38,7 @@ function onSubmit(e) {
     const form = this;
 
     if (form.querySelector('#txtManualPassword').value != form.querySelector('#txtPasswordConfirm').value) {
-        import('../../../components/toast/toast').then((toast) => {
         toast(globalize.translate('PasswordMatchError'));
-        });
     } else {
         submit(form);
     }

src/plugins/chromecastPlayer/plugin.js

@@ -5,6 +5,7 @@ import globalize from '../../scripts/globalize';
 import { Events } from 'jellyfin-apiclient';
 import castSenderApiLoader from '../../components/castSenderApi';
 import ServerConnections from '../../components/ServerConnections';
+import alert from '../../components/alert';
 
 // Based on https://github.com/googlecast/CastVideos-chrome/blob/master/CastVideos.js
 
@@ -440,11 +441,9 @@ class CastPlayer {
 }
 
 function alertText(text, title) {
-    import('../../components/alert').then(({default: alert}) => {
     alert({
-            text: text,
+        text,
-            title: title
+        title
-        });
     });
 }
 

src/plugins/experimentalWarnings/plugin.js

@@ -1,6 +1,7 @@
 import globalize from '../../scripts/globalize';
 import * as userSettings from '../../scripts/settings/userSettings';
 import { appHost } from '../../components/apphost';
+import alert from '../../components/alert';
 
 // TODO: Replace with date-fns
 // https://stackoverflow.com/questions/6117814/get-week-of-year-in-javascript-like-in-php
@@ -26,13 +27,8 @@ function showMessage(text, userSettingsKey, appHostFeature) {
         return Promise.resolve();
     }
 
-    return new Promise(function (resolve, reject) {
     userSettings.set(userSettingsKey, '1', false);
-
+    return alert(text);
-        import('../../components/alert').then(({default: alert}) => {
-            return alert(text).then(resolve, resolve);
-        });
-    });
 }
 
 function showBlurayMessage() {

src/plugins/playAccessValidation/plugin.js

@@ -1,10 +1,9 @@
 import globalize from '../../scripts/globalize';
 import ServerConnections from '../../components/ServerConnections';
+import alert from '../../components/alert';
 
 function showErrorMessage() {
-    return import('../../components/alert').then(({default: alert}) => {
     return alert(globalize.translate('MessagePlayAccessRestricted'));
-    });
 }
 
 class PlayAccessValidation {

src/scripts/clientUtils.js

@@ -1,5 +1,10 @@
 import AppInfo from '../components/AppInfo';
 import ServerConnections from '../components/ServerConnections';
+import toast from '../components/toast/toast';
+import loading from '../components/loading/loading';
+import { appRouter } from '../components/appRouter';
+import baseAlert from '../components/alert';
+import baseConfirm from '../components/confirm/confirm';
 
 export function getCurrentUser() {
     return window.ApiClient.getCurrentUser(false);
@@ -78,39 +83,21 @@ export function navigate(url, preserveQueryString) {
         url += queryString;
     }
 
-    return new Promise(function (resolve, reject) {
+    return appRouter.show(url);
-        import('../components/appRouter').then(({ appRouter }) => {
-            return appRouter.show(url).then(resolve, reject);
-        });
-    });
 }
 
 export function processPluginConfigurationUpdateResult() {
-    Promise.all([
-        import('../components/loading/loading'),
-        import('../components/toast/toast')
-    ])
-        .then(([loading, toast]) => {
     loading.hide();
     toast(Globalize.translate('MessageSettingsSaved'));
-        });
 }
 
 export function processServerConfigurationUpdateResult(result) {
-    Promise.all([
-        import('../components/loading/loading'),
-        import('../components/toast/toast')
-    ])
-        .then(([loading, toast]) => {
     loading.hide();
     toast.default(Globalize.translate('MessageSettingsSaved'));
-        });
 }
 
 export function processErrorResponse(response) {
-    import('../components/loading/loading').then((loading) => {
     loading.hide();
-    });
 
     let status = '' + response.status;
 
@@ -126,19 +113,15 @@ export function processErrorResponse(response) {
 
 export function alert(options) {
     if (typeof options == 'string') {
-        return void import('../components/toast/toast').then((toast) => {
         toast.default({
             text: options
         });
-        });
+    } else {
-    }
+        baseAlert.default({
-
-    import('../components/alert').then((alert) => {
-        alert.default({
             title: options.title || Globalize.translate('HeaderAlert'),
             text: options.message
         }).then(options.callback || function () {});
-    });
+    }
 }
 
 export function capabilities(appHost) {
@@ -161,25 +144,19 @@ export function selectServer() {
 }
 
 export function hideLoadingMsg() {
-    import('../components/loading/loading').then(({default: loading}) => {
     loading.hide();
-    });
 }
 
 export function showLoadingMsg() {
-    import('../components/loading/loading').then(({default: loading}) => {
     loading.show();
-    });
 }
 
 export function confirm(message, title, callback) {
-    import('../components/confirm/confirm').then((confirm) => {
+    baseConfirm(message, title).then(function() {
-        confirm(message, title).then(function() {
         callback(!0);
     }).catch(function() {
         callback(!1);
     });
-    });
 }
 
 const Dashboard = {

src/scripts/deleteHelper.js

@@ -3,13 +3,10 @@ import confirm from '../components/confirm/confirm';
 import { appRouter } from '../components/appRouter';
 import globalize from './globalize';
 import ServerConnections from '../components/ServerConnections';
+import alert from '../components/alert';
 
 function alertText(options) {
-    return new Promise(function (resolve, reject) {
+    return alert(options);
-        import('../components/alert').then((alert) => {
-            alert(options).then(resolve, resolve);
-        });
-    });
 }
 
 export function deleteItem(options) {

src/scripts/serverNotifications.js

@@ -5,6 +5,8 @@ import inputManager from '../scripts/inputManager';
 import focusManager from '../components/focusManager';
 import { appRouter } from '../components/appRouter';
 import ServerConnections from '../components/ServerConnections';
+import toast from '../components/toast/toast';
+import alert from '../components/alert';
 
 const serverNotifications = {};
 
@@ -15,13 +17,9 @@ function notifyApp() {
 function displayMessage(cmd) {
     const args = cmd.Arguments;
     if (args.TimeoutMs) {
-        import('../components/toast/toast').then((toast) => {
         toast({ title: args.Header, text: args.Text });
-        });
     } else {
-        import('../components/alert').then(({default: alert}) => {
         alert({ title: args.Header, text: args.Text });
-        });
     }
 }