diff --git a/package.json b/package.json
index 81d8b5f950..1707f06202 100644
--- a/package.json
+++ b/package.json
@@ -93,6 +93,7 @@
"src/components/accessSchedule/accessSchedule.js",
"src/components/actionSheet/actionSheet.js",
"src/components/activitylog.js",
+ "src/components/alert.js",
"src/components/alphaPicker/alphaPicker.js",
"src/components/autoFocuser.js",
"src/components/cardbuilder/cardBuilder.js",
diff --git a/src/components/activitylog.js b/src/components/activitylog.js
index b51fc6787a..75b07a4cc8 100644
--- a/src/components/activitylog.js
+++ b/src/components/activitylog.js
@@ -128,7 +128,7 @@ import 'listViewStyle';
}
function showItemOverview(item) {
- require(['alert'], function (alert) {
+ import('alert').then(({default: alert})=> {
alert({
text: item.Overview
});
@@ -137,7 +137,6 @@ import 'listViewStyle';
class ActivityLog {
constructor(options) {
- console.log(options)
this.options = options;
var element = options.element;
element.classList.add('activityLogListWidget');
diff --git a/src/components/alert.js b/src/components/alert.js
index 97b580f8f6..80bfbc48e8 100644
--- a/src/components/alert.js
+++ b/src/components/alert.js
@@ -1,12 +1,15 @@
-define(['browser', 'dialog', 'globalize'], function (browser, dialog, globalize) {
- 'use strict';
+import browser from 'browser';
+import dialog from 'dialog';
+import globalize from 'globalize';
+
+/*eslint-disable indent*/
function replaceAll(originalString, strReplace, strWith) {
var reg = new RegExp(strReplace, 'ig');
return originalString.replace(reg, strWith);
}
- return function (text, title) {
+ export default function (text, title) {
var options;
if (typeof text === 'string') {
@@ -41,5 +44,6 @@ define(['browser', 'dialog', 'globalize'], function (browser, dialog, globalize)
}
return Promise.resolve();
- };
-});
+ }
+
+/*eslint-enable indent*/
diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index 0861cf7e00..c2bec1769f 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -53,7 +53,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
break;
case 'ServerUpdateNeeded':
require(['alert'], function (alert) {
- alert({
+ alert.default({
text: globalize.translate('ServerUpdateNeeded', 'https://github.com/jellyfin/jellyfin'),
html: globalize.translate('ServerUpdateNeeded', 'https://github.com/jellyfin/jellyfin')
}).then(function () {
diff --git a/src/components/multiSelect/multiSelect.js b/src/components/multiSelect/multiSelect.js
index 05a2b68f42..922a1fcc19 100644
--- a/src/components/multiSelect/multiSelect.js
+++ b/src/components/multiSelect/multiSelect.js
@@ -338,7 +338,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
if (selection.length < 2) {
require(['alert'], function (alert) {
- alert({
+ alert.default({
text: globalize.translate('PleaseSelectTwoItems')
});
});
diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 73f07a05f2..b74ca5fb3d 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -709,7 +709,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
function showPlaybackInfoErrorMessage(instance, errorCode, playNextTrack) {
require(['alert'], function (alert) {
- alert({
+ alert.default({
text: globalize.translate('PlaybackError' + errorCode),
title: globalize.translate('HeaderPlaybackError')
}).then(function () {
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index b8cdd66651..098a8d6f68 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -86,7 +86,7 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo
if ($('#selectVideoDecoder', form).val()) {
require(['alert'], function (alert) {
- alert({
+ alert.default({
title: globalize.translate('TitleHardwareAcceleration'),
text: globalize.translate('HardwareAccelerationWarning')
}).then(onDecoderConfirmed);
diff --git a/src/controllers/dashboard/metadatanfo.js b/src/controllers/dashboard/metadatanfo.js
index a936192618..3ef1a7cbf9 100644
--- a/src/controllers/dashboard/metadatanfo.js
+++ b/src/controllers/dashboard/metadatanfo.js
@@ -36,7 +36,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize'], function ($, loading,
msg.push(globalize.translate('MetadataSettingChangeHelp'));
require(['alert'], function (alert) {
- alert({
+ alert.default({
text: msg.join('
')
});
});
diff --git a/src/controllers/itemDetails.js b/src/controllers/itemDetails.js
index c9b6b7fc1c..cfaa5ab973 100644
--- a/src/controllers/itemDetails.js
+++ b/src/controllers/itemDetails.js
@@ -1787,7 +1787,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
imageLoader.lazyChildren(collectionItems);
collectionItems.querySelector('.btnAddToCollection').addEventListener('click', function () {
require(['alert'], function (alert) {
- alert({
+ alert.default({
text: globalize.translate('AddItemToCollectionHelp'),
html: globalize.translate('AddItemToCollectionHelp') + '
' + globalize.translate('ButtonLearnMore') + ''
});
diff --git a/src/plugins/chromecastPlayer/plugin.js b/src/plugins/chromecastPlayer/plugin.js
index b3f75f7a6d..dad95691fc 100644
--- a/src/plugins/chromecastPlayer/plugin.js
+++ b/src/plugins/chromecastPlayer/plugin.js
@@ -150,7 +150,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
function alertText(text, title) {
require(['alert'], function (alert) {
- alert({
+ alert.default({
text: text,
title: title
});
diff --git a/src/scripts/serverNotifications.js b/src/scripts/serverNotifications.js
index 2553c284f0..8e212ab718 100644
--- a/src/scripts/serverNotifications.js
+++ b/src/scripts/serverNotifications.js
@@ -15,7 +15,7 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
});
} else {
require(['alert'], function (alert) {
- alert({ title: args.Header, text: args.Text });
+ alert.default({ title: args.Header, text: args.Text });
});
}
}
diff --git a/src/scripts/site.js b/src/scripts/site.js
index c3f93d9545..17bff0decb 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -187,7 +187,7 @@ var Dashboard = {
}
require(['alert'], function (alert) {
- alert({
+ alert.default({
title: options.title || Globalize.translate('HeaderAlert'),
text: options.message
}).then(options.callback || function () {});