';
diff --git a/src/controllers/dashboard/notifications/notifications/index.js b/src/controllers/dashboard/notifications/notifications/index.js
index b97403f8eb..1e0575df88 100644
--- a/src/controllers/dashboard/notifications/notifications/index.js
+++ b/src/controllers/dashboard/notifications/notifications/index.js
@@ -1,7 +1,7 @@
-import loading from 'loading';
-import globalize from 'globalize';
-import 'listViewStyle';
-import 'emby-button';
+import loading from '../../../../components/loading/loading';
+import globalize from '../../../../scripts/globalize';
+import '../../../../components/listview/listview.css';
+import '../../../../elements/emby-button/emby-button';
function reload(page) {
loading.show();
diff --git a/src/controllers/dashboard/playback.js b/src/controllers/dashboard/playback.js
index 101c3ac0a2..b02090cd33 100644
--- a/src/controllers/dashboard/playback.js
+++ b/src/controllers/dashboard/playback.js
@@ -1,7 +1,8 @@
-import $ from 'jQuery';
-import loading from 'loading';
-import libraryMenu from 'libraryMenu';
-import globalize from 'globalize';
+import 'jquery';
+import loading from '../../components/loading/loading';
+import libraryMenu from '../../scripts/libraryMenu';
+import globalize from '../../scripts/globalize';
+import Dashboard from '../../scripts/clientUtils';
/* eslint-disable indent */
diff --git a/src/controllers/dashboard/plugins/add/index.js b/src/controllers/dashboard/plugins/add/index.js
index 5cc1dd3215..89bd499f49 100644
--- a/src/controllers/dashboard/plugins/add/index.js
+++ b/src/controllers/dashboard/plugins/add/index.js
@@ -1,7 +1,10 @@
-import $ from 'jQuery';
-import loading from 'loading';
-import globalize from 'globalize';
-import 'emby-button';
+import 'jquery';
+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 = '';
@@ -21,7 +24,7 @@ function populateVersions(packageInfo, page, installedPlugin) {
for (let i = 0; i < packageInfo.versions.length; i++) {
const version = packageInfo.versions[i];
- html += '
';
+ html += '
';
}
const selectmenu = $('#selectVersion', page).html(html);
@@ -68,9 +71,7 @@ function renderPackage(pkg, installedPlugins, page) {
}
function alertText(options) {
- import('alert').then(({default: alert}) => {
- alert(options);
- });
+ alert(options);
}
function performInstallation(page, name, guid, version) {
@@ -94,12 +95,10 @@ function performInstallation(page, name, guid, version) {
msg += '
';
msg += globalize.translate('PleaseConfirmPluginInstallation');
- import('confirm').then(({default: confirm}) => {
- confirm(msg, globalize.translate('HeaderConfirmPluginInstallation')).then(function () {
- alertCallback();
- }).catch(() => {
- console.debug('plugin not installed');
- });
+ confirm(msg, globalize.translate('HeaderConfirmPluginInstallation')).then(function () {
+ alertCallback();
+ }).catch(() => {
+ console.debug('plugin not installed');
});
} else {
alertCallback();
diff --git a/src/controllers/dashboard/plugins/available/index.js b/src/controllers/dashboard/plugins/available/index.js
index b7c3505aa1..7dc4a9e42d 100644
--- a/src/controllers/dashboard/plugins/available/index.js
+++ b/src/controllers/dashboard/plugins/available/index.js
@@ -1,10 +1,10 @@
-import loading from 'loading';
-import libraryMenu from 'libraryMenu';
-import globalize from 'globalize';
-import 'cardStyle';
-import 'emby-button';
-import 'emby-checkbox';
-import 'emby-select';
+import loading from '../../../../components/loading/loading';
+import libraryMenu from '../../../../scripts/libraryMenu';
+import globalize from '../../../../scripts/globalize';
+import '../../../../components/cardbuilder/card.css';
+import '../../../../elements/emby-button/emby-button';
+import '../../../../elements/emby-checkbox/emby-checkbox';
+import '../../../../elements/emby-select/emby-select';
function reloadList(page) {
loading.show();
diff --git a/src/controllers/dashboard/plugins/installed/index.js b/src/controllers/dashboard/plugins/installed/index.js
index cdf21d6a3c..226ae0defe 100644
--- a/src/controllers/dashboard/plugins/installed/index.js
+++ b/src/controllers/dashboard/plugins/installed/index.js
@@ -1,24 +1,24 @@
-import loading from 'loading';
-import libraryMenu from 'libraryMenu';
-import dom from 'dom';
-import globalize from 'globalize';
-import 'cardStyle';
-import 'emby-button';
+import loading from '../../../../components/loading/loading';
+import libraryMenu from '../../../../scripts/libraryMenu';
+import dom from '../../../../scripts/dom';
+import globalize from '../../../../scripts/globalize';
+import '../../../../components/cardbuilder/card.css';
+import '../../../../elements/emby-button/emby-button';
+import Dashboard, { pageIdOn } from '../../../../scripts/clientUtils';
+import confirm from '../../../../components/confirm/confirm';
function deletePlugin(page, uniqueid, name) {
const msg = globalize.translate('UninstallPluginConfirmation', name);
- import('confirm').then(({default: confirm}) => {
- confirm.default({
- title: globalize.translate('HeaderUninstallPlugin'),
- text: msg,
- primary: 'delete',
- confirmText: globalize.translate('HeaderUninstallPlugin')
- }).then(function () {
- loading.show();
- ApiClient.uninstallPlugin(uniqueid).then(function () {
- reloadList(page);
- });
+ confirm({
+ title: globalize.translate('HeaderUninstallPlugin'),
+ text: msg,
+ primary: 'delete',
+ confirmText: globalize.translate('HeaderUninstallPlugin')
+ }).then(function () {
+ loading.show();
+ ApiClient.uninstallPlugin(uniqueid).then(function () {
+ reloadList(page);
});
});
}
@@ -132,7 +132,7 @@ function showPluginMenu(page, elem) {
});
}
- import('actionsheet').then(({default: actionsheet}) => {
+ import('../../../../components/actionSheet/actionSheet').then((actionsheet) => {
actionsheet.show({
items: menuItems,
positionTo: elem,
diff --git a/src/controllers/dashboard/plugins/repositories/index.js b/src/controllers/dashboard/plugins/repositories/index.js
index 3abee6c90f..08a411545c 100644
--- a/src/controllers/dashboard/plugins/repositories/index.js
+++ b/src/controllers/dashboard/plugins/repositories/index.js
@@ -1,12 +1,12 @@
-import loading from 'loading';
-import libraryMenu from 'libraryMenu';
-import globalize from 'globalize';
-import dialogHelper from 'dialogHelper';
-import 'emby-button';
-import 'emby-checkbox';
-import 'emby-select';
-import 'formDialogStyle';
-import 'listViewStyle';
+import loading from '../../../../components/loading/loading';
+import libraryMenu from '../../../../scripts/libraryMenu';
+import globalize from '../../../../scripts/globalize';
+import dialogHelper from '../../../../components/dialogHelper/dialogHelper';
+import '../../../../elements/emby-button/emby-button';
+import '../../../../elements/emby-checkbox/emby-checkbox';
+import '../../../../elements/emby-select/emby-select';
+import '../../../../components/formdialog.css';
+import '../../../../components/listview/listview.css';
let repositories = [];
diff --git a/src/controllers/dashboard/quickConnect.js b/src/controllers/dashboard/quickConnect.js
index f5eae7b787..0967ed8035 100644
--- a/src/controllers/dashboard/quickConnect.js
+++ b/src/controllers/dashboard/quickConnect.js
@@ -1,6 +1,6 @@
-import loading from 'loading';
-import toast from 'toast';
-import globalize from 'globalize';
+import loading from '../../components/loading/loading';
+import toast from '../../components/toast/toast';
+import globalize from '../../scripts/globalize';
const unavailable = 'Unavailable';
const available = 'Available';
diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtask.js b/src/controllers/dashboard/scheduledtasks/scheduledtask.js
index 64c09c6d81..cd2f7a07ff 100644
--- a/src/controllers/dashboard/scheduledtasks/scheduledtask.js
+++ b/src/controllers/dashboard/scheduledtasks/scheduledtask.js
@@ -1,11 +1,12 @@
-import $ from 'jQuery';
-import loading from 'loading';
-import datetime from 'datetime';
-import dom from 'dom';
-import globalize from 'globalize';
-import 'emby-input';
-import 'emby-button';
-import 'emby-select';
+import 'jquery';
+import loading from '../../../components/loading/loading';
+import datetime from '../../../scripts/datetime';
+import dom from '../../../scripts/dom';
+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 */
@@ -42,7 +43,7 @@ import 'emby-select';
$('.taskName', view).html(task.Name);
$('#pTaskDescription', view).html(task.Description);
- import('listViewStyle').then(() => {
+ import('../../../components/listview/listview.css').then(() => {
ScheduledTaskPage.loadTaskTriggers(view, task);
});
@@ -135,10 +136,8 @@ import 'emby-select';
$('#popupAddTrigger', view).removeClass('hide');
},
confirmDeleteTrigger: function (view, index) {
- import('confirm').then(({default: confirm}) => {
- confirm(globalize.translate('MessageDeleteTaskTrigger'), globalize.translate('HeaderDeleteTaskTrigger')).then(function () {
- ScheduledTaskPage.deleteTrigger(view, index);
- });
+ confirm(globalize.translate('MessageDeleteTaskTrigger'), globalize.translate('HeaderDeleteTaskTrigger')).then(function () {
+ ScheduledTaskPage.deleteTrigger(view, index);
});
},
deleteTrigger: function (view, index) {
diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js
index 81a34d4fa6..498819da68 100644
--- a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js
+++ b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js
@@ -1,12 +1,12 @@
-import $ from 'jQuery';
-import loading from 'loading';
-import events from 'events';
-import globalize from 'globalize';
-import serverNotifications from 'serverNotifications';
-import * as datefns from 'date-fns';
-import dfnshelper from 'dfnshelper';
-import 'listViewStyle';
-import 'emby-button';
+import 'jquery';
+import loading from '../../../components/loading/loading';
+import { Events } from 'jellyfin-apiclient';
+import globalize from '../../../scripts/globalize';
+import serverNotifications from '../../../scripts/serverNotifications';
+import { formatDistance, formatDistanceToNow } from 'date-fns';
+import { getLocale, localeWithSuffix } from '../../../scripts/dfnshelper';
+import '../../../components/listview/listview.css';
+import '../../../elements/emby-button/emby-button';
/* eslint-disable indent */
@@ -77,8 +77,8 @@ import 'emby-button';
if (task.LastExecutionResult) {
const endtime = Date.parse(task.LastExecutionResult.EndTimeUtc);
const starttime = Date.parse(task.LastExecutionResult.StartTimeUtc);
- html += globalize.translate('LabelScheduledTaskLastRan', datefns.formatDistanceToNow(endtime, dfnshelper.localeWithSuffix),
- datefns.formatDistance(starttime, endtime, { locale: dfnshelper.getLocale() }));
+ html += globalize.translate('LabelScheduledTaskLastRan', formatDistanceToNow(endtime, localeWithSuffix),
+ formatDistance(starttime, endtime, { locale: getLocale() }));
if (task.LastExecutionResult.Status === 'Failed') {
html += "
(" + globalize.translate('LabelFailed') + ')';
} else if (task.LastExecutionResult.Status === 'Cancelled') {
@@ -177,7 +177,7 @@ import 'emby-button';
});
view.addEventListener('viewbeforehide', function() {
- events.off(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
+ Events.off(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
stopInterval();
});
@@ -185,7 +185,7 @@ import 'emby-button';
loading.show();
startInterval();
reloadList(view);
- events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
+ Events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
});
}
diff --git a/src/controllers/dashboard/serveractivity.js b/src/controllers/dashboard/serveractivity.js
index ed56126267..1f44b9eefb 100644
--- a/src/controllers/dashboard/serveractivity.js
+++ b/src/controllers/dashboard/serveractivity.js
@@ -1,5 +1,5 @@
-import ActivityLog from 'components/activitylog';
-import globalize from 'globalize';
+import ActivityLog from '../../components/activitylog';
+import globalize from '../../scripts/globalize';
/* eslint-disable indent */
diff --git a/src/controllers/dashboard/streaming.js b/src/controllers/dashboard/streaming.js
index 5db888dfc1..5f504d9535 100644
--- a/src/controllers/dashboard/streaming.js
+++ b/src/controllers/dashboard/streaming.js
@@ -1,7 +1,8 @@
-import $ from 'jQuery';
-import libraryMenu from 'libraryMenu';
-import loading from 'loading';
-import globalize from 'globalize';
+import 'jquery';
+import libraryMenu from '../../scripts/libraryMenu';
+import loading from '../../components/loading/loading';
+import globalize from '../../scripts/globalize';
+import Dashboard from '../../scripts/clientUtils';
/* eslint-disable indent */
diff --git a/src/controllers/dashboard/users/useredit.js b/src/controllers/dashboard/users/useredit.js
index 3d6e7d8bd9..17e401d5dc 100644
--- a/src/controllers/dashboard/users/useredit.js
+++ b/src/controllers/dashboard/users/useredit.js
@@ -1,7 +1,9 @@
-import $ from 'jQuery';
-import loading from 'loading';
-import libraryMenu from 'libraryMenu';
-import globalize from 'globalize';
+import 'jquery';
+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 */
@@ -109,10 +111,7 @@ import globalize from 'globalize';
function onSaveComplete(page, user) {
Dashboard.navigate('userprofiles.html');
loading.hide();
-
- import('toast').then(({default: toast}) => {
- toast(globalize.translate('SettingsSaved'));
- });
+ toast(globalize.translate('SettingsSaved'));
}
function saveUser(user, page) {
diff --git a/src/controllers/dashboard/users/userlibraryaccess.js b/src/controllers/dashboard/users/userlibraryaccess.js
index d840092c45..d3407de5b6 100644
--- a/src/controllers/dashboard/users/userlibraryaccess.js
+++ b/src/controllers/dashboard/users/userlibraryaccess.js
@@ -1,7 +1,9 @@
-import $ from 'jQuery';
-import loading from 'loading';
-import libraryMenu from 'libraryMenu';
-import globalize from 'globalize';
+import 'jquery';
+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 */
@@ -91,10 +93,7 @@ import globalize from 'globalize';
function onSaveComplete(page) {
loading.hide();
-
- import('toast').then(({default: toast}) => {
- toast(globalize.translate('SettingsSaved'));
- });
+ toast(globalize.translate('SettingsSaved'));
}
function saveUser(user, page) {
diff --git a/src/controllers/dashboard/users/usernew.js b/src/controllers/dashboard/users/usernew.js
index 68b6365c02..95138a5125 100644
--- a/src/controllers/dashboard/users/usernew.js
+++ b/src/controllers/dashboard/users/usernew.js
@@ -1,7 +1,9 @@
-import $ from 'jQuery';
-import loading from 'loading';
-import globalize from 'globalize';
-import 'emby-checkbox';
+import 'jquery';
+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 */
@@ -88,10 +90,7 @@ import 'emby-checkbox';
Dashboard.navigate('useredit.html?userId=' + user.Id);
});
}, function (response) {
- import('toast').then(({default: toast}) => {
- toast(globalize.translate('ErrorDefault'));
- });
-
+ toast(globalize.translate('ErrorDefault'));
loading.hide();
});
}
diff --git a/src/controllers/dashboard/users/userparentalcontrol.js b/src/controllers/dashboard/users/userparentalcontrol.js
index efe00aec0b..282037c21f 100644
--- a/src/controllers/dashboard/users/userparentalcontrol.js
+++ b/src/controllers/dashboard/users/userparentalcontrol.js
@@ -1,10 +1,11 @@
-import $ from 'jQuery';
-import datetime from 'datetime';
-import loading from 'loading';
-import libraryMenu from 'libraryMenu';
-import globalize from 'globalize';
-import 'listViewStyle';
-import 'paper-icon-button-light';
+import 'jquery';
+import datetime from '../../../scripts/datetime';
+import loading from '../../../components/loading/loading';
+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 'paper-icon-button-light';
function onSaveComplete(page) {
loading.hide();
-
- import('toast').then(({default: toast}) => {
- toast(globalize.translate('SettingsSaved'));
- });
+ toast(globalize.translate('SettingsSaved'));
}
function saveUser(user, page) {
@@ -195,7 +193,7 @@ import 'paper-icon-button-light';
function showSchedulePopup(page, schedule, index) {
schedule = schedule || {};
- import('components/accessSchedule/accessSchedule').then(({default: accessschedule}) => {
+ import('../../../components/accessSchedule/accessSchedule').then(({default: accessschedule}) => {
accessschedule.show({
schedule: schedule
}).then(function (updatedSchedule) {
@@ -228,7 +226,7 @@ import 'paper-icon-button-light';
}
function showBlockedTagPopup(page) {
- import('prompt').then(({default: prompt}) => {
+ import('../../../components/prompt/prompt').then(({default: prompt}) => {
prompt({
label: globalize.translate('LabelTag')
}).then(function (value) {
diff --git a/src/controllers/dashboard/users/userpasswordpage.js b/src/controllers/dashboard/users/userpasswordpage.js
index 880dccf9ff..ab76ce474f 100644
--- a/src/controllers/dashboard/users/userpasswordpage.js
+++ b/src/controllers/dashboard/users/userpasswordpage.js
@@ -1,7 +1,10 @@
-import loading from 'loading';
-import libraryMenu from 'libraryMenu';
-import globalize from 'globalize';
-import 'emby-button';
+import loading from '../../../components/loading/loading';
+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 */
@@ -52,7 +55,7 @@ import 'emby-button';
page.querySelector('.chkEnableLocalEasyPassword').checked = user.Configuration.EnableLocalPassword;
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(page);
});
});
@@ -81,10 +84,7 @@ import 'emby-button';
user.Configuration.EnableLocalPassword = view.querySelector('.chkEnableLocalEasyPassword').checked;
ApiClient.updateUserConfiguration(user.Id, user.Configuration).then(function () {
loading.hide();
-
- import('toast').then(({default: toast}) => {
- toast(globalize.translate('SettingsSaved'));
- });
+ toast(globalize.translate('SettingsSaved'));
loadUser(view, params);
});
@@ -104,10 +104,7 @@ import 'emby-button';
ApiClient.updateUserPassword(userId, currentPassword, newPassword).then(function () {
loading.hide();
-
- import('toast').then(({default: toast}) => {
- toast(globalize.translate('PasswordSaved'));
- });
+ toast(globalize.translate('PasswordSaved'));
loadUser(view, params);
}, function () {
@@ -123,9 +120,7 @@ import 'emby-button';
const form = this;
if (form.querySelector('#txtNewPassword').value != form.querySelector('#txtNewPasswordConfirm').value) {
- import('toast').then(({default: toast}) => {
- toast(globalize.translate('PasswordMatchError'));
- });
+ toast(globalize.translate('PasswordMatchError'));
} else {
loading.show();
savePassword();
@@ -144,18 +139,16 @@ import 'emby-button';
function resetPassword() {
const msg = globalize.translate('PasswordResetConfirmation');
- import('confirm').then(({default: confirm}) => {
- confirm(msg, globalize.translate('ResetPassword')).then(function () {
- const userId = params.userId;
- loading.show();
- ApiClient.resetUserPassword(userId).then(function () {
- loading.hide();
- Dashboard.alert({
- message: globalize.translate('PasswordResetComplete'),
- title: globalize.translate('ResetPassword')
- });
- loadUser(view, params);
+ confirm(msg, globalize.translate('ResetPassword')).then(function () {
+ const userId = params.userId;
+ loading.show();
+ ApiClient.resetUserPassword(userId).then(function () {
+ loading.hide();
+ Dashboard.alert({
+ message: globalize.translate('PasswordResetComplete'),
+ title: globalize.translate('ResetPassword')
});
+ loadUser(view, params);
});
});
}
@@ -163,18 +156,16 @@ import 'emby-button';
function resetEasyPassword() {
const msg = globalize.translate('PinCodeResetConfirmation');
- import('confirm').then(({default: confirm}) => {
- confirm(msg, globalize.translate('HeaderPinCodeReset')).then(function () {
- const userId = params.userId;
- loading.show();
- ApiClient.resetEasyPassword(userId).then(function () {
- loading.hide();
- Dashboard.alert({
- message: globalize.translate('PinCodeResetComplete'),
- title: globalize.translate('HeaderPinCodeReset')
- });
- loadUser(view, params);
+ confirm(msg, globalize.translate('HeaderPinCodeReset')).then(function () {
+ const userId = params.userId;
+ loading.show();
+ ApiClient.resetEasyPassword(userId).then(function () {
+ loading.hide();
+ Dashboard.alert({
+ message: globalize.translate('PinCodeResetComplete'),
+ title: globalize.translate('HeaderPinCodeReset')
});
+ loadUser(view, params);
});
});
}
diff --git a/src/controllers/dashboard/users/userprofilespage.js b/src/controllers/dashboard/users/userprofilespage.js
index bfd8d96d92..a88393d731 100644
--- a/src/controllers/dashboard/users/userprofilespage.js
+++ b/src/controllers/dashboard/users/userprofilespage.js
@@ -1,30 +1,30 @@
-import loading from 'loading';
-import dom from 'dom';
-import globalize from 'globalize';
-import * as datefns from 'date-fns';
-import dfnshelper from 'dfnshelper';
-import 'paper-icon-button-light';
-import 'cardStyle';
-import 'emby-button';
-import 'indicators';
-import 'flexStyles';
+import loading from '../../../components/loading/loading';
+import dom from '../../../scripts/dom';
+import globalize from '../../../scripts/globalize';
+import { formatDistanceToNow } from 'date-fns';
+import { localeWithSuffix } from '../../../scripts/dfnshelper';
+import '../../../elements/emby-button/paper-icon-button-light';
+import '../../../components/cardbuilder/card.css';
+import '../../../elements/emby-button/emby-button';
+import '../../../components/indicators/indicators.css';
+import '../../../assets/css/flexstyles.scss';
+import Dashboard, { pageIdOn } from '../../../scripts/clientUtils';
+import confirm from '../../../components/confirm/confirm';
/* eslint-disable indent */
function deleteUser(page, id) {
const msg = globalize.translate('DeleteUserConfirmation');
- import('confirm').then(({default: confirm}) => {
- confirm({
- title: globalize.translate('DeleteUser'),
- text: msg,
- confirmText: globalize.translate('Delete'),
- primary: 'delete'
- }).then(function () {
- loading.show();
- ApiClient.deleteUser(id).then(function () {
- loadData(page);
- });
+ confirm({
+ title: globalize.translate('DeleteUser'),
+ text: msg,
+ confirmText: globalize.translate('Delete'),
+ primary: 'delete'
+ }).then(function () {
+ loading.show();
+ ApiClient.deleteUser(id).then(function () {
+ loadData(page);
});
});
}
@@ -55,7 +55,7 @@ import 'flexStyles';
icon: 'delete'
});
- import('actionsheet').then(({default: actionsheet}) => {
+ import('../../../components/actionSheet/actionSheet').then(({default: actionsheet}) => {
actionsheet.show({
items: menuItems,
positionTo: card,
@@ -139,7 +139,7 @@ import 'flexStyles';
// how dates are returned by the server when the session is active and show something like 'Active now', instead of past/future sentences
function getLastSeenText(lastActivityDate) {
if (lastActivityDate) {
- return globalize.translate('LastSeen', datefns.formatDistanceToNow(Date.parse(lastActivityDate), dfnshelper.localeWithSuffix));
+ return globalize.translate('LastSeen', formatDistanceToNow(Date.parse(lastActivityDate), localeWithSuffix));
}
return '';
diff --git a/src/controllers/edititemmetadata.js b/src/controllers/edititemmetadata.js
index dd51ba2581..a371e6161a 100644
--- a/src/controllers/edititemmetadata.js
+++ b/src/controllers/edititemmetadata.js
@@ -1,11 +1,11 @@
-import loading from 'loading';
-import 'scripts/editorsidebar';
+import loading from '../components/loading/loading';
+import '../scripts/editorsidebar';
function reload(context, itemId) {
loading.show();
if (itemId) {
- import('metadataEditor').then(({ default: metadataEditor }) => {
+ import('../components/metadataEditor/metadataEditor').then(({ default: metadataEditor }) => {
metadataEditor.embed(context.querySelector('.editPageInnerContent'), itemId, ApiClient.serverInfo().Id);
});
} else {
diff --git a/src/controllers/favorites.js b/src/controllers/favorites.js
index fc37f4eef4..05a313c6ad 100644
--- a/src/controllers/favorites.js
+++ b/src/controllers/favorites.js
@@ -1,12 +1,13 @@
-import appRouter from 'appRouter';
-import cardBuilder from 'cardBuilder';
-import dom from 'dom';
-import globalize from 'globalize';
-import appHost from 'apphost';
-import layoutManager from 'layoutManager';
-import focusManager from 'focusManager';
-import 'emby-itemscontainer';
-import 'emby-scroller';
+import { appRouter } from '../components/appRouter';
+import cardBuilder from '../components/cardbuilder/cardBuilder';
+import dom from '../scripts/dom';
+import globalize from '../scripts/globalize';
+import { appHost } from '../components/apphost';
+import layoutManager from '../components/layoutManager';
+import focusManager from '../components/focusManager';
+import '../elements/emby-itemscontainer/emby-itemscontainer';
+import '../elements/emby-scroller/emby-scroller';
+import ServerConnections from '../components/ServerConnections';
/* eslint-disable indent */
@@ -269,7 +270,7 @@ class FavoritesTab {
constructor(view, params) {
this.view = view;
this.params = params;
- this.apiClient = window.connectionManager.currentApiClient();
+ this.apiClient = ServerConnections.currentApiClient();
this.sectionsContainer = view.querySelector('.sections');
createSections(this, this.sectionsContainer, this.apiClient);
}
diff --git a/src/controllers/home.js b/src/controllers/home.js
index 72e326e46b..4ebaa62add 100644
--- a/src/controllers/home.js
+++ b/src/controllers/home.js
@@ -1,8 +1,9 @@
-import TabbedView from 'tabbedView';
-import globalize from 'globalize';
-import 'emby-tabs';
-import 'emby-button';
-import 'emby-scroller';
+import TabbedView from '../components/tabbedview/tabbedview';
+import globalize from '../scripts/globalize';
+import '../elements/emby-tabs/emby-tabs';
+import '../elements/emby-button/emby-button';
+import '../elements/emby-scroller/emby-scroller';
+import { appRouter } from '../components/appRouter';
class HomeView extends TabbedView {
constructor(view, params) {
@@ -10,7 +11,7 @@ class HomeView extends TabbedView {
}
setTitle() {
- Emby.Page.setTitle(null);
+ appRouter.setTitle(null);
}
onPause() {
@@ -44,15 +45,15 @@ class HomeView extends TabbedView {
switch (index) {
case 0:
- depends = 'controllers/hometab';
+ depends = 'hometab';
break;
case 1:
- depends = 'controllers/favorites';
+ depends = 'favorites';
}
const instance = this;
- return import(depends).then(({ default: controllerFactory }) => {
+ return import(/* webpackChunkName: "[request]" */ `../controllers/${depends}`).then(({ default: controllerFactory }) => {
let controller = instance.tabControllers[index];
if (!controller) {
diff --git a/src/controllers/hometab.js b/src/controllers/hometab.js
index ff56e08d14..feb31fedc3 100644
--- a/src/controllers/hometab.js
+++ b/src/controllers/hometab.js
@@ -1,14 +1,15 @@
-import * as userSettings from 'userSettings';
-import loading from 'loading';
-import focusManager from 'focusManager';
-import homeSections from 'homeSections';
-import 'emby-itemscontainer';
+import * as userSettings from '../scripts/settings/userSettings';
+import loading from '../components/loading/loading';
+import focusManager from '../components/focusManager';
+import homeSections from '../components/homesections/homesections';
+import '../elements/emby-itemscontainer/emby-itemscontainer';
+import ServerConnections from '../components/ServerConnections';
class HomeTab {
constructor(view, params) {
this.view = view;
this.params = params;
- this.apiClient = window.connectionManager.currentApiClient();
+ this.apiClient = ServerConnections.currentApiClient();
this.sectionsContainer = view.querySelector('.sections');
view.querySelector('.sections').addEventListener('settingschange', onHomeScreenSettingsChanged.bind(this));
}
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index 4c2d29538d..bcf681b50a 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -1,32 +1,36 @@
-import appHost from 'apphost';
-import loading from 'loading';
-import appRouter from 'appRouter';
-import itemShortcuts from 'itemShortcuts';
-import layoutManager from 'layoutManager';
-import * as userSettings from 'userSettings';
-import cardBuilder from 'cardBuilder';
-import datetime from 'datetime';
-import mediaInfo from 'mediaInfo';
-import backdrop from 'backdrop';
-import listView from 'listView';
-import itemContextMenu from 'itemContextMenu';
-import itemHelper from 'itemHelper';
-import dom from 'dom';
-import indicators from 'indicators';
-import imageLoader from 'imageLoader';
-import libraryMenu from 'libraryMenu';
-import globalize from 'globalize';
-import browser from 'browser';
-import events from 'events';
-import playbackManager from 'playbackManager';
-import 'scrollStyles';
-import 'emby-itemscontainer';
-import 'emby-checkbox';
-import 'emby-button';
-import 'emby-playstatebutton';
-import 'emby-ratingbutton';
-import 'emby-scroller';
-import 'emby-select';
+import { appHost } from '../../components/apphost';
+import loading from '../../components/loading/loading';
+import { appRouter } from '../../components/appRouter';
+import layoutManager from '../../components/layoutManager';
+import { Events } from 'jellyfin-apiclient';
+import * as userSettings from '../../scripts/settings/userSettings';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import datetime from '../../scripts/datetime';
+import mediaInfo from '../../components/mediainfo/mediainfo';
+import backdrop from '../../components/backdrop/backdrop';
+import listView from '../../components/listview/listview';
+import itemContextMenu from '../../components/itemContextMenu';
+import itemHelper from '../../components/itemHelper';
+import dom from '../../scripts/dom';
+import indicators from '../../components/indicators/indicators';
+import imageLoader from '../../components/images/imageLoader';
+import libraryMenu from '../../scripts/libraryMenu';
+import globalize from '../../scripts/globalize';
+import browser from '../../scripts/browser';
+import { playbackManager } from '../../components/playback/playbackmanager';
+import '../../assets/css/scrollstyles.css';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
+import '../../elements/emby-checkbox/emby-checkbox';
+import '../../elements/emby-button/emby-button';
+import '../../elements/emby-playstatebutton/emby-playstatebutton';
+import '../../elements/emby-ratingbutton/emby-ratingbutton';
+import '../../elements/emby-scroller/emby-scroller';
+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';
+import { download } from '../../scripts/fileDownloader';
function getPromise(apiClient, params) {
const id = params.id;
@@ -140,7 +144,7 @@ function renderSeriesTimerEditor(page, item, apiClient, user) {
}
if (user.Policy.EnableLiveTvManagement) {
- import('seriesRecordingEditor').then(({ default: seriesRecordingEditor }) => {
+ import('../../components/recordingcreator/seriesrecordingeditor').then(({ default: seriesRecordingEditor }) => {
seriesRecordingEditor.embed(item, apiClient.serverId(), {
context: page.querySelector('.seriesRecordingEditor')
});
@@ -563,9 +567,9 @@ function renderDetailPageBackdrop(page, item, apiClient) {
}
function reloadFromItem(instance, page, params, item, user) {
- const apiClient = window.connectionManager.getApiClient(item.ServerId);
+ const apiClient = ServerConnections.getApiClient(item.ServerId);
- Emby.Page.setTitle('');
+ appRouter.setTitle('');
// Start rendering the artwork first
renderImage(page, item);
@@ -666,7 +670,7 @@ function reloadFromItem(instance, page, params, item, user) {
hideAll(page, 'btnDownload', true);
}
- import('autoFocuser').then(({ default: autoFocuser }) => {
+ import('../../components/autoFocuser').then(({ default: autoFocuser }) => {
autoFocuser.autoFocus(page);
});
}
@@ -708,7 +712,7 @@ function showRecordingFields(instance, page, item, user) {
const recordingFieldsElement = page.querySelector('.recordingFields');
if (item.Type == 'Program' && user.Policy.EnableLiveTvManagement) {
- import('recordingFields').then(({ default: recordingFields }) => {
+ import('../../components/recordingcreator/recordingfields').then(({ default: recordingFields }) => {
instance.currentRecordingFields = new recordingFields({
parent: recordingFieldsElement,
programId: item.Id,
@@ -783,7 +787,11 @@ function renderImage(page, item) {
}
function refreshDetailImageUserData(elem, item) {
- elem.querySelector('.detailImageProgressContainer').innerHTML = indicators.getProgressBarHtml(item);
+ const container = elem.querySelector('.detailImageProgressContainer');
+
+ if (container) {
+ container.innerHTML = indicators.getProgressBarHtml(item);
+ }
}
function refreshImage(page, item) {
@@ -805,7 +813,7 @@ function renderNextUp(page, item, user) {
return void section.classList.add('hide');
}
- window.connectionManager.getApiClient(item.ServerId).getNextUpEpisodes({
+ ServerConnections.getApiClient(item.ServerId).getNextUpEpisodes({
SeriesId: item.Id,
UserId: user.Id
}).then(function (result) {
@@ -1209,7 +1217,7 @@ function renderSimilarItems(page, item, context) {
}
similarCollapsible.classList.remove('hide');
- const apiClient = window.connectionManager.getApiClient(item.ServerId);
+ const apiClient = ServerConnections.getApiClient(item.ServerId);
const options = {
userId: apiClient.getCurrentUserId(),
limit: 12,
@@ -1323,7 +1331,7 @@ function renderChildren(page, item) {
}
let promise;
- const apiClient = window.connectionManager.getApiClient(item.ServerId);
+ const apiClient = ServerConnections.getApiClient(item.ServerId);
const userId = apiClient.getCurrentUserId();
if (item.Type == 'Series') {
@@ -1485,13 +1493,13 @@ function renderChildren(page, item) {
}
function renderItemsByName(page, item) {
- import('scripts/itembynamedetailpage').then(() => {
+ import('../../scripts/itembynamedetailpage').then(() => {
window.ItemsByName.renderItems(page, item);
});
}
function renderPlaylistItems(page, item) {
- import('scripts/playlistedit').then(() => {
+ import('../../scripts/playlistedit').then(() => {
PlaylistViewer.render(page, item);
});
}
@@ -1571,7 +1579,7 @@ function renderChannelGuide(page, apiClient, item) {
}
function renderSeriesSchedule(page, item) {
- const apiClient = window.connectionManager.getApiClient(item.ServerId);
+ const apiClient = ServerConnections.getApiClient(item.ServerId);
apiClient.getLiveTvPrograms({
UserId: apiClient.getCurrentUserId(),
HasAired: false,
@@ -1695,7 +1703,7 @@ function renderCollectionItems(page, parentItem, types, items) {
// HACK: Call autoFocuser again because btnPlay may be hidden, but focused by reloadFromItem
// FIXME: Sometimes focus does not move until all (?) sections are loaded
- import('autoFocuser').then(({ default: autoFocuser }) => {
+ import('../../components/autoFocuser').then(({ default: autoFocuser }) => {
autoFocuser.autoFocus(page);
});
}
@@ -1731,7 +1739,7 @@ function renderCollectionItemType(page, parentItem, type, items) {
}
function renderMusicVideos(page, item, user) {
- window.connectionManager.getApiClient(item.ServerId).getItems(user.Id, {
+ ServerConnections.getApiClient(item.ServerId).getItems(user.Id, {
SortBy: 'SortName',
SortOrder: 'Ascending',
IncludeItemTypes: 'MusicVideo',
@@ -1751,7 +1759,7 @@ function renderMusicVideos(page, item, user) {
}
function renderAdditionalParts(page, item, user) {
- window.connectionManager.getApiClient(item.ServerId).getAdditionalVideoParts(user.Id, item.Id).then(function (result) {
+ ServerConnections.getApiClient(item.ServerId).getAdditionalVideoParts(user.Id, item.Id).then(function (result) {
if (result.Items.length) {
page.querySelector('#additionalPartsCollapsible').classList.remove('hide');
const additionalPartsContent = page.querySelector('#additionalPartsContent');
@@ -1770,7 +1778,7 @@ function renderScenes(page, item) {
page.querySelector('#scenesCollapsible').classList.remove('hide');
const scenesContent = page.querySelector('#scenesContent');
- import('chaptercardbuilder').then(({ default: chaptercardbuilder }) => {
+ import('../../components/cardbuilder/chaptercardbuilder').then(({ default: chaptercardbuilder }) => {
chaptercardbuilder.buildChapterCards(item, chapters, {
itemsContainer: scenesContent,
backdropShape: 'overflowBackdrop',
@@ -1796,7 +1804,7 @@ function getVideosHtml(items) {
}
function renderSpecials(page, item, user) {
- window.connectionManager.getApiClient(item.ServerId).getSpecialFeatures(user.Id, item.Id).then(function (specials) {
+ ServerConnections.getApiClient(item.ServerId).getSpecialFeatures(user.Id, item.Id).then(function (specials) {
const specialsContent = page.querySelector('#specialsContent');
specialsContent.innerHTML = getVideosHtml(specials);
imageLoader.lazyChildren(specialsContent);
@@ -1815,7 +1823,7 @@ function renderCast(page, item) {
page.querySelector('#castCollapsible').classList.remove('hide');
const castContent = page.querySelector('#castContent');
- import('peoplecardbuilder').then(({ default: peoplecardbuilder }) => {
+ import('../../components/cardbuilder/peoplecardbuilder').then(({ default: peoplecardbuilder }) => {
peoplecardbuilder.buildPeopleCards(people, {
itemsContainer: castContent,
coverImage: true,
@@ -1849,10 +1857,14 @@ function onTrackSelectionsSubmit(e) {
window.ItemDetailPage = new itemDetailPage();
export default function (view, params) {
+ function getApiClient() {
+ return params.serverId ? ServerConnections.getApiClient(params.serverId) : ApiClient;
+ }
+
function reload(instance, page, params) {
loading.show();
- const apiClient = params.serverId ? window.connectionManager.getApiClient(params.serverId) : ApiClient;
+ const apiClient = getApiClient();
Promise.all([getPromise(apiClient, params), apiClient.getCurrentUser()]).then(([item, user]) => {
currentItem = item;
@@ -1863,16 +1875,14 @@ export default function (view, params) {
}
function splitVersions(instance, page, apiClient, params) {
- import('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({
- type: 'DELETE',
- url: apiClient.getUrl('Videos/' + params.id + '/AlternateSources')
- }).then(function () {
- loading.hide();
- reload(instance, page, params);
- });
+ confirm('Are you sure you wish to split the media sources into separate items?', 'Split Media Apart').then(function () {
+ loading.show();
+ apiClient.ajax({
+ type: 'DELETE',
+ url: apiClient.getUrl('Videos/' + params.id + '/AlternateSources')
+ }).then(function () {
+ loading.hide();
+ reload(instance, page, params);
});
});
}
@@ -1901,7 +1911,7 @@ export default function (view, params) {
const item = currentItem;
if (item.Type === 'Program') {
- const apiClient = window.connectionManager.getApiClient(item.ServerId);
+ const apiClient = ServerConnections.getApiClient(item.ServerId);
return void apiClient.getLiveTvChannel(item.ChannelId, apiClient.getCurrentUserId()).then(function (channel) {
playbackManager.play({
items: [channel]
@@ -1929,7 +1939,7 @@ export default function (view, params) {
}
function onCancelSeriesTimerClick() {
- import('recordingHelper').then(({ default: recordingHelper }) => {
+ import('../../components/recordingcreator/recordinghelper').then(({ default: recordingHelper }) => {
recordingHelper.cancelSeriesTimerWithConfirmation(currentItem.Id, currentItem.ServerId).then(function () {
Dashboard.navigate('livetv.html');
});
@@ -1937,8 +1947,8 @@ export default function (view, params) {
}
function onCancelTimerClick() {
- import('recordingHelper').then(({ default: recordingHelper }) => {
- recordingHelper.cancelTimer(window.connectionManager.getApiClient(currentItem.ServerId), currentItem.TimerId).then(function () {
+ import('../../components/recordingcreator/recordinghelper').then(({ default: recordingHelper }) => {
+ recordingHelper.cancelTimer(ServerConnections.getApiClient(currentItem.ServerId), currentItem.TimerId).then(function () {
reload(self, view, params);
});
});
@@ -1949,20 +1959,20 @@ export default function (view, params) {
}
function onDownloadClick() {
- import('fileDownloader').then(({ default: fileDownloader }) => {
- const downloadHref = apiClient.getItemDownloadUrl(currentItem.Id);
- fileDownloader.download([{
- url: downloadHref,
- itemId: currentItem.Id,
- serverId: currentItem.serverId
- }]);
- });
+ const downloadHref = getApiClient().getItemDownloadUrl(currentItem.Id);
+ download([{
+ url: downloadHref,
+ itemId: currentItem.Id,
+ serverId: currentItem.serverId
+ }]);
}
function onMoreCommandsClick() {
const button = this;
let selectedItem = view.querySelector('.selectSource').value || currentItem.Id;
+ const apiClient = getApiClient();
+
apiClient.getItem(apiClient.getCurrentUserId(), selectedItem).then(function (item) {
selectedItem = item;
@@ -1985,6 +1995,7 @@ export default function (view, params) {
function onWebSocketMessage(e, data) {
const msg = data;
+ const apiClient = getApiClient();
if (msg.MessageType === 'UserDataChanged' && currentItem && msg.Data.UserId == apiClient.getCurrentUserId()) {
const key = currentItem.UserData.Key;
@@ -2002,63 +2013,68 @@ export default function (view, params) {
let currentItem;
const self = this;
- const apiClient = params.serverId ? window.connectionManager.getApiClient(params.serverId) : ApiClient;
- const btnResume = view.querySelector('.mainDetailButtons .btnResume');
- const btnPlay = view.querySelector('.mainDetailButtons .btnPlay');
- if (layoutManager.tv && !btnResume.classList.contains('hide')) {
- btnResume.classList.add('fab');
- btnResume.classList.add('detailFloatingButton');
- } else if (layoutManager.tv && btnResume.classList.contains('hide')) {
- btnPlay.classList.add('fab');
- btnPlay.classList.add('detailFloatingButton');
- }
+ function init() {
+ const apiClient = getApiClient();
- view.querySelectorAll('.btnPlay');
- bindAll(view, '.btnPlay', 'click', onPlayClick);
- bindAll(view, '.btnResume', 'click', onPlayClick);
- bindAll(view, '.btnInstantMix', 'click', onInstantMixClick);
- bindAll(view, '.btnShuffle', 'click', onShuffleClick);
- bindAll(view, '.btnPlayTrailer', 'click', onPlayTrailerClick);
- bindAll(view, '.btnCancelSeriesTimer', 'click', onCancelSeriesTimerClick);
- bindAll(view, '.btnCancelTimer', 'click', onCancelTimerClick);
- bindAll(view, '.btnDownload', 'click', onDownloadClick);
- view.querySelector('.detailImageContainer').addEventListener('click', onPosterClick);
- view.querySelector('.trackSelections').addEventListener('submit', onTrackSelectionsSubmit);
- view.querySelector('.btnSplitVersions').addEventListener('click', function () {
- splitVersions(self, view, apiClient, params);
- });
- bindAll(view, '.btnMoreCommands', 'click', onMoreCommandsClick);
- view.querySelector('.selectSource').addEventListener('change', function () {
- renderVideoSelections(view, self._currentPlaybackMediaSources);
- renderAudioSelections(view, self._currentPlaybackMediaSources);
- renderSubtitleSelections(view, self._currentPlaybackMediaSources);
- });
- view.addEventListener('viewshow', function (e) {
- const page = this;
-
- libraryMenu.setTransparentMenu(true);
-
- if (e.detail.isRestored) {
- if (currentItem) {
- Emby.Page.setTitle('');
- renderTrackSelections(page, self, currentItem, true);
- }
- } else {
- reload(self, page, params);
+ const btnResume = view.querySelector('.mainDetailButtons .btnResume');
+ const btnPlay = view.querySelector('.mainDetailButtons .btnPlay');
+ if (layoutManager.tv && !btnResume.classList.contains('hide')) {
+ btnResume.classList.add('fab');
+ btnResume.classList.add('detailFloatingButton');
+ } else if (layoutManager.tv && btnResume.classList.contains('hide')) {
+ btnPlay.classList.add('fab');
+ btnPlay.classList.add('detailFloatingButton');
}
- events.on(apiClient, 'message', onWebSocketMessage);
- events.on(playbackManager, 'playerchange', onPlayerChange);
- });
- view.addEventListener('viewbeforehide', function () {
- events.off(apiClient, 'message', onWebSocketMessage);
- events.off(playbackManager, 'playerchange', onPlayerChange);
- libraryMenu.setTransparentMenu(false);
- });
- view.addEventListener('viewdestroy', function () {
- currentItem = null;
- self._currentPlaybackMediaSources = null;
- self.currentRecordingFields = null;
- });
+ view.querySelectorAll('.btnPlay');
+ bindAll(view, '.btnPlay', 'click', onPlayClick);
+ bindAll(view, '.btnResume', 'click', onPlayClick);
+ bindAll(view, '.btnInstantMix', 'click', onInstantMixClick);
+ bindAll(view, '.btnShuffle', 'click', onShuffleClick);
+ bindAll(view, '.btnPlayTrailer', 'click', onPlayTrailerClick);
+ bindAll(view, '.btnCancelSeriesTimer', 'click', onCancelSeriesTimerClick);
+ bindAll(view, '.btnCancelTimer', 'click', onCancelTimerClick);
+ bindAll(view, '.btnDownload', 'click', onDownloadClick);
+ view.querySelector('.detailImageContainer').addEventListener('click', onPosterClick);
+ view.querySelector('.trackSelections').addEventListener('submit', onTrackSelectionsSubmit);
+ view.querySelector('.btnSplitVersions').addEventListener('click', function () {
+ splitVersions(self, view, apiClient, params);
+ });
+ bindAll(view, '.btnMoreCommands', 'click', onMoreCommandsClick);
+ view.querySelector('.selectSource').addEventListener('change', function () {
+ renderVideoSelections(view, self._currentPlaybackMediaSources);
+ renderAudioSelections(view, self._currentPlaybackMediaSources);
+ renderSubtitleSelections(view, self._currentPlaybackMediaSources);
+ });
+ view.addEventListener('viewshow', function (e) {
+ const page = this;
+
+ libraryMenu.setTransparentMenu(true);
+
+ if (e.detail.isRestored) {
+ if (currentItem) {
+ appRouter.setTitle('');
+ renderTrackSelections(page, self, currentItem, true);
+ }
+ } else {
+ reload(self, page, params);
+ }
+
+ Events.on(apiClient, 'message', onWebSocketMessage);
+ Events.on(playbackManager, 'playerchange', onPlayerChange);
+ });
+ view.addEventListener('viewbeforehide', function () {
+ Events.off(apiClient, 'message', onWebSocketMessage);
+ Events.off(playbackManager, 'playerchange', onPlayerChange);
+ libraryMenu.setTransparentMenu(false);
+ });
+ view.addEventListener('viewdestroy', function () {
+ currentItem = null;
+ self._currentPlaybackMediaSources = null;
+ self.currentRecordingFields = null;
+ });
+ }
+
+ init();
}
diff --git a/src/controllers/list.js b/src/controllers/list.js
index 07e07eeb05..de55173422 100644
--- a/src/controllers/list.js
+++ b/src/controllers/list.js
@@ -1,21 +1,23 @@
-import globalize from 'globalize';
-import listView from 'listView';
-import layoutManager from 'layoutManager';
-import * as userSettings from 'userSettings';
-import focusManager from 'focusManager';
-import cardBuilder from 'cardBuilder';
-import loading from 'loading';
-import AlphaNumericShortcuts from 'alphaNumericShortcuts';
-import playbackManager from 'playbackManager';
-import AlphaPicker from 'alphaPicker';
-import 'emby-itemscontainer';
-import 'emby-scroller';
+import globalize from '../scripts/globalize';
+import listView from '../components/listview/listview';
+import layoutManager from '../components/layoutManager';
+import * as userSettings from '../scripts/settings/userSettings';
+import focusManager from '../components/focusManager';
+import cardBuilder from '../components/cardbuilder/cardBuilder';
+import loading from '../components/loading/loading';
+import AlphaNumericShortcuts from '../scripts/alphanumericshortcuts';
+import { playbackManager } from '../components/playback/playbackmanager';
+import AlphaPicker from '../components/alphaPicker/alphaPicker';
+import '../elements/emby-itemscontainer/emby-itemscontainer';
+import '../elements/emby-scroller/emby-scroller';
+import ServerConnections from '../components/ServerConnections';
+import { appRouter } from '../components/appRouter';
/* eslint-disable indent */
function getInitialLiveTvQuery(instance, params) {
const query = {
- UserId: window.connectionManager.getApiClient(params.serverId).getCurrentUserId(),
+ UserId: ServerConnections.getApiClient(params.serverId).getCurrentUserId(),
StartIndex: 0,
Fields: 'ChannelInfo,PrimaryImageAspectRatio',
Limit: 300
@@ -231,7 +233,7 @@ import 'emby-scroller';
}
function getItems(instance, params, item, sortBy, startIndex, limit) {
- const apiClient = window.connectionManager.getApiClient(params.serverId);
+ const apiClient = ServerConnections.getApiClient(params.serverId);
instance.queryRecursive = false;
if (params.type === 'Recordings') {
@@ -332,7 +334,7 @@ import 'emby-scroller';
return Promise.resolve(null);
}
- const apiClient = window.connectionManager.getApiClient(params.serverId);
+ const apiClient = ServerConnections.getApiClient(params.serverId);
const itemId = params.genreId || params.musicGenreId || params.studioId || params.personId || params.parentId;
if (itemId) {
@@ -345,7 +347,7 @@ import 'emby-scroller';
function showViewSettingsMenu() {
const instance = this;
- import('viewSettings').then(({default: ViewSettings}) => {
+ import('../components/viewSettings/viewSettings').then(({default: ViewSettings}) => {
new ViewSettings().show({
settingsKey: instance.getSettingsKey(),
settings: instance.getViewSettings(),
@@ -360,7 +362,7 @@ import 'emby-scroller';
function showFilterMenu() {
const instance = this;
- import('filterMenu').then(({default: FilterMenu}) => {
+ import('../components/filtermenu/filtermenu').then(({default: FilterMenu}) => {
new FilterMenu().show({
settingsKey: instance.getSettingsKey(),
settings: instance.getFilters(),
@@ -379,7 +381,7 @@ import 'emby-scroller';
function showSortMenu() {
const instance = this;
- import('sortMenu').then(({default: SortMenu}) => {
+ import('../components/sortmenu/sortmenu').then(({default: SortMenu}) => {
new SortMenu().show({
settingsKey: instance.getSettingsKey(),
settings: instance.getSortValues(),
@@ -397,7 +399,7 @@ import 'emby-scroller';
function onNewItemClick() {
const instance = this;
- import('playlistEditor').then(({default: playlistEditor}) => {
+ import('../components/playlisteditor/playlisteditor').then(({default: playlistEditor}) => {
new playlistEditor({
items: [],
serverId: instance.params.serverId
@@ -572,7 +574,7 @@ class ItemsView {
}
function setTitle(item) {
- Emby.Page.setTitle(getTitle(item) || '');
+ appRouter.setTitle(getTitle(item) || '');
if (item && item.CollectionType === 'playlists') {
hideOrShowAll(view.querySelectorAll('.btnNewItem'), false);
diff --git a/src/controllers/livetv/livetvchannels.js b/src/controllers/livetv/livetvchannels.js
index 278200c634..ebf17def54 100644
--- a/src/controllers/livetv/livetvchannels.js
+++ b/src/controllers/livetv/livetvchannels.js
@@ -1,10 +1,10 @@
-import cardBuilder from 'cardBuilder';
-import imageLoader from 'imageLoader';
-import libraryBrowser from 'libraryBrowser';
-import loading from 'loading';
-import events from 'events';
-import * as userSettings from 'userSettings';
-import 'emby-itemscontainer';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import imageLoader from '../../components/images/imageLoader';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import loading from '../../components/loading/loading';
+import { Events } from 'jellyfin-apiclient';
+import * as userSettings from '../../scripts/settings/userSettings';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
export default function (view, params, tabContent) {
function getPageData() {
@@ -91,13 +91,13 @@ export default function (view, params, tabContent) {
}
function showFilterMenu(context) {
- import(['components/filterdialog/filterdialog']).then(({default: FilterDialog}) => {
+ import('../../components/filterdialog/filterdialog').then(({default: FilterDialog}) => {
const filterDialog = new FilterDialog({
query: getQuery(),
mode: 'livetvchannels',
serverId: ApiClient.serverId()
});
- events.on(filterDialog, 'filterchange', function () {
+ Events.on(filterDialog, 'filterchange', function () {
reloadItems(context);
});
filterDialog.show();
@@ -115,7 +115,7 @@ export default function (view, params, tabContent) {
loading.hide();
isLoading = false;
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(view);
});
});
diff --git a/src/controllers/livetv/livetvguide.js b/src/controllers/livetv/livetvguide.js
index f8b49bd22a..c56d4ebd04 100644
--- a/src/controllers/livetv/livetvguide.js
+++ b/src/controllers/livetv/livetvguide.js
@@ -1,4 +1,4 @@
-import tvguide from 'tvguide';
+import tvguide from '../../components/guide/guide';
export default function (view, params, tabContent) {
let guideInstance;
diff --git a/src/controllers/livetv/livetvrecordings.js b/src/controllers/livetv/livetvrecordings.js
index ec2f57e14f..a1fb55f53a 100644
--- a/src/controllers/livetv/livetvrecordings.js
+++ b/src/controllers/livetv/livetvrecordings.js
@@ -1,9 +1,10 @@
-import loading from 'loading';
-import cardBuilder from 'cardBuilder';
-import imageLoader from 'imageLoader';
-import 'scripts/livetvcomponents';
-import 'listViewStyle';
-import 'emby-itemscontainer';
+import loading from '../../components/loading/loading';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import imageLoader from '../../components/images/imageLoader';
+import '../../scripts/livetvcomponents';
+import '../../components/listview/listview.css';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
+import Dashboard from '../../scripts/clientUtils';
function renderRecordings(elem, recordings, cardOptions, scrollX) {
if (!elem) {
diff --git a/src/controllers/livetv/livetvschedule.js b/src/controllers/livetv/livetvschedule.js
index d7bfbad059..a30db98791 100644
--- a/src/controllers/livetv/livetvschedule.js
+++ b/src/controllers/livetv/livetvschedule.js
@@ -1,10 +1,11 @@
-import layoutManager from 'layoutManager';
-import cardBuilder from 'cardBuilder';
-import imageLoader from 'imageLoader';
-import loading from 'loading';
-import 'scripts/livetvcomponents';
-import 'emby-button';
-import 'emby-itemscontainer';
+import layoutManager from '../../components/layoutManager';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import imageLoader from '../../components/images/imageLoader';
+import loading from '../../components/loading/loading';
+import '../../scripts/livetvcomponents';
+import '../../elements/emby-button/emby-button';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
+import Dashboard from '../../scripts/clientUtils';
function enableScrollX() {
return !layoutManager.desktop;
diff --git a/src/controllers/livetv/livetvseriestimers.js b/src/controllers/livetv/livetvseriestimers.js
index 4f6bfaaa6a..3029fca5a6 100644
--- a/src/controllers/livetv/livetvseriestimers.js
+++ b/src/controllers/livetv/livetvseriestimers.js
@@ -1,8 +1,8 @@
-import cardBuilder from 'cardBuilder';
-import imageLoader from 'imageLoader';
-import loading from 'loading';
-import 'paper-icon-button-light';
-import 'emby-button';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import imageLoader from '../../components/images/imageLoader';
+import loading from '../../components/loading/loading';
+import '../../elements/emby-button/paper-icon-button-light';
+import '../../elements/emby-button/emby-button';
function renderTimers(context, timers) {
const html = cardBuilder.getCardsHtml({
diff --git a/src/controllers/livetv/livetvsuggested.js b/src/controllers/livetv/livetvsuggested.js
index 346630012a..bc011001ca 100644
--- a/src/controllers/livetv/livetvsuggested.js
+++ b/src/controllers/livetv/livetvsuggested.js
@@ -1,15 +1,16 @@
-import layoutManager from 'layoutManager';
-import * as userSettings from 'userSettings';
-import inputManager from 'inputManager';
-import loading from 'loading';
-import globalize from 'globalize';
-import * as mainTabsManager from 'mainTabsManager';
-import cardBuilder from 'cardBuilder';
-import imageLoader from 'imageLoader';
-import 'scrollStyles';
-import 'emby-itemscontainer';
-import 'emby-tabs';
-import 'emby-button';
+import layoutManager from '../../components/layoutManager';
+import * as userSettings from '../../scripts/settings/userSettings';
+import inputManager from '../../scripts/inputManager';
+import loading from '../../components/loading/loading';
+import globalize from '../../scripts/globalize';
+import * as mainTabsManager from '../../components/maintabsmanager';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import imageLoader from '../../components/images/imageLoader';
+import '../../assets/css/scrollstyles.css';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
+import '../../elements/emby-tabs/emby-tabs';
+import '../../elements/emby-button/emby-button';
+import Dashboard from '../../scripts/clientUtils';
function enableScrollX() {
return !layoutManager.desktop;
@@ -60,7 +61,7 @@ function loadRecommendedPrograms(page) {
});
loading.hide();
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(page);
});
});
@@ -239,31 +240,31 @@ export default function (view, params) {
// TODO int is a little hard to read
switch (index) {
case 0:
- depends = 'controllers/livetv/livetvsuggested';
+ depends = 'livetvsuggested';
break;
case 1:
- depends = 'controllers/livetv/livetvguide';
+ depends = 'livetvguide';
break;
case 2:
- depends = 'controllers/livetv/livetvchannels';
+ depends = 'livetvchannels';
break;
case 3:
- depends = 'controllers/livetv/livetvrecordings';
+ depends = 'livetvrecordings';
break;
case 4:
- depends = 'controllers/livetv/livetvschedule';
+ depends = 'livetvschedule';
break;
case 5:
- depends = 'controllers/livetv/livetvseriestimers';
+ depends = 'livetvseriestimers';
break;
}
- import(depends).then(({default: controllerFactory}) => {
+ import(`../livetv/${depends}`).then(({default: controllerFactory}) => {
let tabContent;
if (index === 0) {
diff --git a/src/controllers/livetvguideprovider.js b/src/controllers/livetvguideprovider.js
index 6ab195a088..ecdb186e9f 100644
--- a/src/controllers/livetvguideprovider.js
+++ b/src/controllers/livetvguideprovider.js
@@ -1,23 +1,22 @@
-import events from 'events';
-import loading from 'loading';
-import globalize from 'globalize';
+import { Events } from 'jellyfin-apiclient';
+import loading from '../components/loading/loading';
+import globalize from '../scripts/globalize';
+import Dashboard, { pageIdOn } from '../scripts/clientUtils';
function onListingsSubmitted() {
Dashboard.navigate('livetvstatus.html');
}
function init(page, type, providerId) {
- const url = 'components/tvproviders/' + type + '.js';
-
- import(url).then(({default: factory}) => {
+ import(`../components/tvproviders/${type}`).then(({default: factory}) => {
const instance = new factory(page, providerId, {});
- events.on(instance, 'submitted', onListingsSubmitted);
+ Events.on(instance, 'submitted', onListingsSubmitted);
instance.init();
});
}
function loadTemplate(page, type, providerId) {
- import('text!./../components/tvproviders/' + type + '.template.html').then(({default: html}) => {
+ import(`../components/tvproviders/${type}.template.html`).then(({default: html}) => {
page.querySelector('.providerTemplate').innerHTML = globalize.translateHtml(html);
init(page, type, providerId);
});
diff --git a/src/controllers/livetvsettings.js b/src/controllers/livetvsettings.js
index 29ec4a10a5..2a32503861 100644
--- a/src/controllers/livetvsettings.js
+++ b/src/controllers/livetvsettings.js
@@ -1,7 +1,9 @@
-import $ from 'jQuery';
-import loading from 'loading';
-import globalize from 'globalize';
-import 'emby-button';
+import 'jquery';
+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();
@@ -50,9 +52,7 @@ function showSaveMessage(recordingPathChanged) {
}
if (msg) {
- import('alert').then(({default: alert}) => {
- alert(msg);
- });
+ alert(msg);
}
}
@@ -61,7 +61,7 @@ export default function () {
const page = this;
$('.liveTvSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
$('#btnSelectRecordingPath', page).on('click.selectDirectory', function () {
- import('directorybrowser').then(({default: directoryBrowser}) => {
+ import('../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
const picker = new directoryBrowser();
picker.show({
callback: function (path) {
@@ -76,7 +76,7 @@ export default function () {
});
});
$('#btnSelectMovieRecordingPath', page).on('click.selectDirectory', function () {
- import('directorybrowser').then(({default: directoryBrowser}) => {
+ import('../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
const picker = new directoryBrowser();
picker.show({
callback: function (path) {
@@ -91,7 +91,7 @@ export default function () {
});
});
$('#btnSelectSeriesRecordingPath', page).on('click.selectDirectory', function () {
- import('directorybrowser').then(({default: directoryBrowser}) => {
+ import('../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
const picker = new directoryBrowser();
picker.show({
callback: function (path) {
@@ -106,7 +106,7 @@ export default function () {
});
});
$('#btnSelectPostProcessorPath', page).on('click.selectDirectory', function () {
- import('directorybrowser').then(({default: directoryBrowser}) => {
+ import('../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
const picker = new directoryBrowser();
picker.show({
includeFiles: true,
diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js
index dcf15adf07..c1ee98f205 100644
--- a/src/controllers/livetvstatus.js
+++ b/src/controllers/livetvstatus.js
@@ -1,16 +1,18 @@
-import $ from 'jQuery';
-import globalize from 'globalize';
-import taskButton from 'scripts/taskbutton';
-import dom from 'dom';
-import layoutManager from 'layoutManager';
-import loading from 'loading';
-import browser from 'browser';
-import 'listViewStyle';
-import 'flexStyles';
-import 'emby-itemscontainer';
-import 'cardStyle';
-import 'material-icons';
-import 'emby-button';
+import 'jquery';
+import globalize from '../scripts/globalize';
+import taskButton from '../scripts/taskbutton';
+import dom from '../scripts/dom';
+import layoutManager from '../components/layoutManager';
+import loading from '../components/loading/loading';
+import browser from '../scripts/browser';
+import '../components/listview/listview.css';
+import '../assets/css/flexstyles.scss';
+import '../elements/emby-itemscontainer/emby-itemscontainer';
+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;
@@ -56,17 +58,15 @@ function renderDevices(page, devices) {
function deleteDevice(page, id) {
const message = globalize.translate('MessageConfirmDeleteTunerDevice');
- import('confirm').then(({default: confirm}) => {
- confirm(message, globalize.translate('HeaderDeleteDevice')).then(function () {
- loading.show();
- ApiClient.ajax({
- type: 'DELETE',
- url: ApiClient.getUrl('LiveTv/TunerHosts', {
- Id: id
- })
- }).then(function () {
- reload(page);
- });
+ confirm(message, globalize.translate('HeaderDeleteDevice')).then(function () {
+ loading.show();
+ ApiClient.ajax({
+ type: 'DELETE',
+ url: ApiClient.getUrl('LiveTv/TunerHosts', {
+ Id: id
+ })
+ }).then(function () {
+ reload(page);
});
});
}
@@ -145,7 +145,7 @@ function showProviderOptions(page, providerId, button) {
id: 'map'
});
- import('actionsheet').then(({default: actionsheet}) => {
+ import('../components/actionSheet/actionSheet').then(({default: actionsheet}) => {
actionsheet.show({
items: items,
positionTo: button
@@ -163,7 +163,7 @@ function showProviderOptions(page, providerId, button) {
}
function mapChannels(page, providerId) {
- import('components/channelMapper/channelMapper').then(({default: channelMapper}) => {
+ import('../components/channelMapper/channelMapper').then(({default: channelMapper}) => {
new channelMapper({
serverId: ApiClient.serverInfo().Id,
providerId: providerId
@@ -174,19 +174,17 @@ function mapChannels(page, providerId) {
function deleteProvider(page, id) {
const message = globalize.translate('MessageConfirmDeleteGuideProvider');
- import('confirm').then(({default: confirm}) => {
- confirm(message, globalize.translate('HeaderDeleteProvider')).then(function () {
- loading.show();
- ApiClient.ajax({
- type: 'DELETE',
- url: ApiClient.getUrl('LiveTv/ListingProviders', {
- Id: id
- })
- }).then(function () {
- reload(page);
- }, function () {
- reload(page);
- });
+ confirm(message, globalize.translate('HeaderDeleteProvider')).then(function () {
+ loading.show();
+ ApiClient.ajax({
+ type: 'DELETE',
+ url: ApiClient.getUrl('LiveTv/ListingProviders', {
+ Id: id
+ })
+ }).then(function () {
+ reload(page);
+ }, function () {
+ reload(page);
});
});
}
@@ -237,7 +235,7 @@ function addProvider(button) {
id: 'xmltv'
});
- import('actionsheet').then(({default: actionsheet}) => {
+ import('../components/actionSheet/actionSheet').then(({default: actionsheet}) => {
actionsheet.show({
items: menuItems,
positionTo: button,
@@ -263,7 +261,7 @@ function showDeviceMenu(button, tunerDeviceId) {
id: 'edit'
});
- import('actionsheet').then(({default: actionsheet}) => {
+ import('../components/actionSheet/actionSheet').then(({default: actionsheet}) => {
actionsheet.show({
items: items,
positionTo: button
diff --git a/src/controllers/livetvtuner.js b/src/controllers/livetvtuner.js
index 0e3b2b689e..65933b03fb 100644
--- a/src/controllers/livetvtuner.js
+++ b/src/controllers/livetvtuner.js
@@ -1,10 +1,11 @@
-import globalize from 'globalize';
-import loading from 'loading';
-import dom from 'dom';
-import 'emby-input';
-import 'emby-button';
-import 'emby-checkbox';
-import 'emby-select';
+import globalize from '../scripts/globalize';
+import loading from '../components/loading/loading';
+import dom from '../scripts/dom';
+import '../elements/emby-input/emby-input';
+import '../elements/emby-button/emby-button';
+import '../elements/emby-checkbox/emby-checkbox';
+import '../elements/emby-select/emby-select';
+import Dashboard from '../scripts/clientUtils';
function isM3uVariant(type) {
return ['nextpvr'].indexOf(type || '') !== -1;
@@ -102,7 +103,7 @@ function submitForm(page) {
}
function getDetectedDevice() {
- return import('tunerPicker').then(({default: tunerPicker}) => {
+ return import('../components/tunerPicker').then(({default: tunerPicker}) => {
return new tunerPicker().show({
serverId: ApiClient.serverId()
});
@@ -211,7 +212,7 @@ export default function (view, params) {
});
});
view.querySelector('.btnSelectPath').addEventListener('click', function () {
- import('directorybrowser').then(({default: directorybrowser}) => {
+ import('../components/directorybrowser/directorybrowser').then(({default: directorybrowser}) => {
const picker = new directorybrowser();
picker.show({
includeFiles: true,
diff --git a/src/controllers/movies/moviecollections.js b/src/controllers/movies/moviecollections.js
index 6aed25f9a8..cfabe016ca 100644
--- a/src/controllers/movies/moviecollections.js
+++ b/src/controllers/movies/moviecollections.js
@@ -1,11 +1,11 @@
-import loading from 'loading';
-import libraryBrowser from 'libraryBrowser';
-import imageLoader from 'imageLoader';
-import listView from 'listView';
-import cardBuilder from 'cardBuilder';
-import * as userSettings from 'userSettings';
-import globalize from 'globalize';
-import 'emby-itemscontainer';
+import loading from '../../components/loading/loading';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import imageLoader from '../../components/images/imageLoader';
+import listView from '../../components/listview/listview';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import * as userSettings from '../../scripts/settings/userSettings';
+import globalize from '../../scripts/globalize';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
/* eslint-disable indent */
@@ -193,7 +193,7 @@ import 'emby-itemscontainer';
loading.hide();
isLoading = false;
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(page);
});
});
@@ -246,7 +246,7 @@ import 'emby-itemscontainer';
reloadItems(tabContent);
});
tabContent.querySelector('.btnNewCollection').addEventListener('click', () => {
- import('collectionEditor').then(({default: collectionEditor}) => {
+ import('../../components/collectionEditor/collectionEditor').then(({default: collectionEditor}) => {
const serverId = ApiClient.serverInfo().Id;
new collectionEditor({
items: [],
diff --git a/src/controllers/movies/moviegenres.js b/src/controllers/movies/moviegenres.js
index ca02ede36d..1cda1a6cd6 100644
--- a/src/controllers/movies/moviegenres.js
+++ b/src/controllers/movies/moviegenres.js
@@ -1,11 +1,11 @@
-import layoutManager from 'layoutManager';
-import loading from 'loading';
-import libraryBrowser from 'libraryBrowser';
-import cardBuilder from 'cardBuilder';
-import lazyLoader from 'lazyLoader';
-import globalize from 'globalize';
-import appRouter from 'appRouter';
-import 'emby-button';
+import layoutManager from '../../components/layoutManager';
+import loading from '../../components/loading/loading';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import lazyLoader from '../../components/lazyLoader/lazyLoaderIntersectionObserver';
+import globalize from '../../scripts/globalize';
+import { appRouter } from '../../components/appRouter';
+import '../../elements/emby-button/emby-button';
/* eslint-disable indent */
@@ -17,7 +17,7 @@ import 'emby-button';
if (!pageData) {
pageData = data[key] = {
query: {
- SortBy: 'SortName',
+ SortBy: 'Random',
SortOrder: 'Ascending',
IncludeItemTypes: 'Movie',
Recursive: true,
diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js
index 09be5a71f0..4d2b4c6c3a 100644
--- a/src/controllers/movies/movies.js
+++ b/src/controllers/movies/movies.js
@@ -1,12 +1,12 @@
-import loading from 'loading';
-import * as userSettings from 'userSettings';
-import events from 'events';
-import libraryBrowser from 'libraryBrowser';
-import AlphaPicker from 'alphaPicker';
-import listView from 'listView';
-import cardBuilder from 'cardBuilder';
-import globalize from 'globalize';
-import 'emby-itemscontainer';
+import loading from '../../components/loading/loading';
+import * as userSettings from '../../scripts/settings/userSettings';
+import { Events } from 'jellyfin-apiclient';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import { AlphaPicker } from '../../components/alphaPicker/alphaPicker';
+import listView from '../../components/listview/listview';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import globalize from '../../scripts/globalize';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
/* eslint-disable indent */
@@ -91,7 +91,7 @@ import 'emby-itemscontainer';
isLoading = false;
loading.hide();
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(tabContent);
});
}
@@ -278,13 +278,13 @@ import 'emby-itemscontainer';
query = userSettings.loadQuerySettings(savedQueryKey, query);
this.showFilterMenu = function () {
- import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
+ import('../../components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
const filterDialog = new filterDialogFactory({
query: query,
mode: 'movies',
serverId: ApiClient.serverId()
});
- events.on(filterDialog, 'filterchange', () => {
+ Events.on(filterDialog, 'filterchange', () => {
query.StartIndex = 0;
itemsContainer.refreshItems();
});
diff --git a/src/controllers/movies/moviesrecommended.js b/src/controllers/movies/moviesrecommended.js
index 80e391c5ef..7de4cb4559 100644
--- a/src/controllers/movies/moviesrecommended.js
+++ b/src/controllers/movies/moviesrecommended.js
@@ -1,18 +1,20 @@
-import events from 'events';
-import layoutManager from 'layoutManager';
-import inputManager from 'inputManager';
-import * as userSettings from 'userSettings';
-import libraryMenu from 'libraryMenu';
-import * as mainTabsManager from 'mainTabsManager';
-import cardBuilder from 'cardBuilder';
-import dom from 'dom';
-import imageLoader from 'imageLoader';
-import playbackManager from 'playbackManager';
-import globalize from 'globalize';
-import 'emby-scroller';
-import 'emby-itemscontainer';
-import 'emby-tabs';
-import 'emby-button';
+
+import { Events } from 'jellyfin-apiclient';
+import layoutManager from '../../components/layoutManager';
+import inputManager from '../../scripts/inputManager';
+import * as userSettings from '../../scripts/settings/userSettings';
+import libraryMenu from '../../scripts/libraryMenu';
+import * as mainTabsManager from '../../components/maintabsmanager';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import dom from '../../scripts/dom';
+import imageLoader from '../../components/images/imageLoader';
+import { playbackManager } from '../../components/playback/playbackmanager';
+import globalize from '../../scripts/globalize';
+import '../../elements/emby-scroller/emby-scroller';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
+import '../../elements/emby-tabs/emby-tabs';
+import '../../elements/emby-button/emby-button';
+import Dashboard from '../../scripts/clientUtils';
/* eslint-disable indent */
@@ -182,7 +184,7 @@ import 'emby-button';
}
function autoFocus(page) {
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(page);
});
}
@@ -281,31 +283,31 @@ import 'emby-button';
switch (index) {
case 0:
- depends = 'controllers/movies/movies';
+ depends = 'movies';
break;
case 1:
- depends = 'controllers/movies/moviesrecommended.js';
+ depends = 'moviesrecommended.js';
break;
case 2:
- depends = 'controllers/movies/movietrailers';
+ depends = 'movietrailers';
break;
case 3:
- depends = 'controllers/movies/movies';
+ depends = 'movies';
break;
case 4:
- depends = 'controllers/movies/moviecollections';
+ depends = 'moviecollections';
break;
case 5:
- depends = 'controllers/movies/moviegenres';
+ depends = 'moviegenres';
break;
}
- import(depends).then(({default: controllerFactory}) => {
+ import(`../movies/${depends}`).then(({default: controllerFactory}) => {
let tabContent;
if (index === suggestionsTabIndex) {
@@ -403,7 +405,7 @@ import 'emby-button';
}
}
- events.on(playbackManager, 'playbackstop', onPlaybackStop);
+ Events.on(playbackManager, 'playbackstop', onPlaybackStop);
inputManager.on(window, onInputCommand);
});
view.addEventListener('viewbeforehide', function () {
diff --git a/src/controllers/movies/movietrailers.js b/src/controllers/movies/movietrailers.js
index def55d919a..8c8246b4e1 100644
--- a/src/controllers/movies/movietrailers.js
+++ b/src/controllers/movies/movietrailers.js
@@ -1,13 +1,13 @@
-import loading from 'loading';
-import events from 'events';
-import libraryBrowser from 'libraryBrowser';
-import imageLoader from 'imageLoader';
-import AlphaPicker from 'alphaPicker';
-import listView from 'listView';
-import cardBuilder from 'cardBuilder';
-import * as userSettings from 'userSettings';
-import globalize from 'globalize';
-import 'emby-itemscontainer';
+import loading from '../../components/loading/loading';
+import { Events } from 'jellyfin-apiclient';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import imageLoader from '../../components/images/imageLoader';
+import { AlphaPicker } from '../../components/alphaPicker/alphaPicker';
+import listView from '../../components/listview/listview';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import * as userSettings from '../../scripts/settings/userSettings';
+import globalize from '../../scripts/globalize';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
/* eslint-disable indent */
@@ -192,13 +192,13 @@ import 'emby-itemscontainer';
let isLoading = false;
this.showFilterMenu = function () {
- import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
+ import('../../components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
const filterDialog = new filterDialogFactory({
query: getQuery(tabContent),
mode: 'movies',
serverId: ApiClient.serverId()
});
- events.on(filterDialog, 'filterchange', function () {
+ Events.on(filterDialog, 'filterchange', function () {
getQuery(tabContent).StartIndex = 0;
reloadItems();
});
diff --git a/src/controllers/music/musicalbums.js b/src/controllers/music/musicalbums.js
index 55e59b6289..fe885b09a3 100644
--- a/src/controllers/music/musicalbums.js
+++ b/src/controllers/music/musicalbums.js
@@ -1,14 +1,14 @@
-import playbackManager from 'playbackManager';
-import loading from 'loading';
-import events from 'events';
-import libraryBrowser from 'libraryBrowser';
-import imageLoader from 'imageLoader';
-import AlphaPicker from 'alphaPicker';
-import listView from 'listView';
-import cardBuilder from 'cardBuilder';
-import * as userSettings from 'userSettings';
-import globalize from 'globalize';
-import 'emby-itemscontainer';
+import { playbackManager } from '../../components/playback/playbackmanager';
+import loading from '../../components/loading/loading';
+import { Events } from 'jellyfin-apiclient';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import imageLoader from '../../components/images/imageLoader';
+import AlphaPicker from '../../components/alphaPicker/alphaPicker';
+import listView from '../../components/listview/listview';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import * as userSettings from '../../scripts/settings/userSettings';
+import globalize from '../../scripts/globalize';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
/* eslint-disable indent */
@@ -179,7 +179,7 @@ import 'emby-itemscontainer';
loading.hide();
isLoading = false;
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(tabContent);
});
});
@@ -204,14 +204,13 @@ import 'emby-itemscontainer';
let isLoading = false;
this.showFilterMenu = function () {
- import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
+ import('../../components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
const filterDialog = new filterDialogFactory({
query: getQuery(),
mode: 'albums',
serverId: ApiClient.serverId()
});
-
- events.on(filterDialog, 'filterchange', function () {
+ Events.on(filterDialog, 'filterchange', function () {
getQuery().StartIndex = 0;
reloadItems(tabContent);
});
diff --git a/src/controllers/music/musicartists.js b/src/controllers/music/musicartists.js
index 3517437622..c6e5770999 100644
--- a/src/controllers/music/musicartists.js
+++ b/src/controllers/music/musicartists.js
@@ -1,12 +1,12 @@
-import loading from 'loading';
-import events from 'events';
-import libraryBrowser from 'libraryBrowser';
-import imageLoader from 'imageLoader';
-import AlphaPicker from 'alphaPicker';
-import listView from 'listView';
-import cardBuilder from 'cardBuilder';
-import * as userSettings from 'userSettings';
-import 'emby-itemscontainer';
+import loading from '../../components/loading/loading';
+import { Events } from 'jellyfin-apiclient';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import imageLoader from '../../components/images/imageLoader';
+import { AlphaPicker } from '../../components/alphaPicker/alphaPicker';
+import listView from '../../components/listview/listview';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import * as userSettings from '../../scripts/settings/userSettings';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
/* eslint-disable indent */
@@ -161,7 +161,7 @@ import 'emby-itemscontainer';
loading.hide();
isLoading = false;
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(tabContent);
});
});
@@ -176,13 +176,13 @@ import 'emby-itemscontainer';
let isLoading = false;
this.showFilterMenu = function () {
- import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
+ import('../../components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
const filterDialog = new filterDialogFactory({
query: getQuery(tabContent),
mode: this.mode,
serverId: ApiClient.serverId()
});
- events.on(filterDialog, 'filterchange', function () {
+ Events.on(filterDialog, 'filterchange', function () {
getQuery(tabContent).StartIndex = 0;
reloadItems(tabContent);
});
diff --git a/src/controllers/music/musicgenres.js b/src/controllers/music/musicgenres.js
index 2cd9e2114b..c0e48e9a52 100644
--- a/src/controllers/music/musicgenres.js
+++ b/src/controllers/music/musicgenres.js
@@ -1,7 +1,7 @@
-import libraryBrowser from 'libraryBrowser';
-import cardBuilder from 'cardBuilder';
-import imageLoader from 'imageLoader';
-import loading from 'loading';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import imageLoader from '../../components/images/imageLoader';
+import loading from '../../components/loading/loading';
/* eslint-disable indent */
@@ -92,7 +92,7 @@ import loading from 'loading';
libraryBrowser.saveQueryValues(getSavedQueryKey(), query);
loading.hide();
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(context);
});
});
diff --git a/src/controllers/music/musicplaylists.js b/src/controllers/music/musicplaylists.js
index 67e6a959eb..2d98aa5a99 100644
--- a/src/controllers/music/musicplaylists.js
+++ b/src/controllers/music/musicplaylists.js
@@ -1,7 +1,7 @@
-import libraryBrowser from 'libraryBrowser';
-import cardBuilder from 'cardBuilder';
-import imageLoader from 'imageLoader';
-import loading from 'loading';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import imageLoader from '../../components/images/imageLoader';
+import loading from '../../components/loading/loading';
/* eslint-disable indent */
@@ -63,7 +63,7 @@ import loading from 'loading';
libraryBrowser.saveQueryValues(getSavedQueryKey(), query);
loading.hide();
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(context);
});
});
diff --git a/src/controllers/music/musicrecommended.js b/src/controllers/music/musicrecommended.js
index 32137ccaa8..10bbaae7db 100644
--- a/src/controllers/music/musicrecommended.js
+++ b/src/controllers/music/musicrecommended.js
@@ -1,19 +1,20 @@
-import browser from 'browser';
-import layoutManager from 'layoutManager';
-import * as userSettings from 'userSettings';
-import inputManager from 'inputManager';
-import loading from 'loading';
-import cardBuilder from 'cardBuilder';
-import dom from 'dom';
-import imageLoader from 'imageLoader';
-import libraryMenu from 'libraryMenu';
-import * as mainTabsManager from 'mainTabsManager';
-import globalize from 'globalize';
-import 'scrollStyles';
-import 'emby-itemscontainer';
-import 'emby-tabs';
-import 'emby-button';
-import 'flexStyles';
+import browser from '../../scripts/browser';
+import layoutManager from '../../components/layoutManager';
+import * as userSettings from '../../scripts/settings/userSettings';
+import inputManager from '../../scripts/inputManager';
+import loading from '../../components/loading/loading';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import dom from '../../scripts/dom';
+import imageLoader from '../../components/images/imageLoader';
+import libraryMenu from '../../scripts/libraryMenu';
+import * as mainTabsManager from '../../components/maintabsmanager';
+import globalize from '../../scripts/globalize';
+import '../../assets/css/scrollstyles.css';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
+import '../../elements/emby-tabs/emby-tabs';
+import '../../elements/emby-button/emby-button';
+import '../../assets/css/flexstyles.scss';
+import Dashboard from '../../scripts/clientUtils';
/* eslint-disable indent */
@@ -74,7 +75,7 @@ import 'flexStyles';
imageLoader.lazyChildren(elem);
loading.hide();
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(page);
});
});
@@ -170,7 +171,7 @@ import 'flexStyles';
loadRecentlyPlayed(tabContent, parentId);
loadFrequentlyPlayed(tabContent, parentId);
- import('components/favoriteitems').then(({default: favoriteItems}) => {
+ import('../../components/favoriteitems').then(({default: favoriteItems}) => {
favoriteItems.render(tabContent, ApiClient.getCurrentUserId(), parentId, ['favoriteArtists', 'favoriteAlbums', 'favoriteSongs']);
});
}
@@ -268,32 +269,32 @@ import 'flexStyles';
switch (index) {
case 0:
- depends = 'controllers/music/musicalbums';
+ depends = 'musicalbums';
break;
case 1:
- depends = 'controllers/music/musicrecommended';
+ depends = 'musicrecommended';
break;
case 2:
case 3:
- depends = 'controllers/music/musicartists';
+ depends = 'musicartists';
break;
case 4:
- depends = 'controllers/music/musicplaylists';
+ depends = 'musicplaylists';
break;
case 5:
- depends = 'controllers/music/songs';
+ depends = 'songs';
break;
case 6:
- depends = 'controllers/music/musicgenres';
+ depends = 'musicgenres';
break;
}
- import(depends).then(({default: controllerFactory}) => {
+ import(`../music/${depends}`).then(({default: controllerFactory}) => {
let tabContent;
if (index == 1) {
diff --git a/src/controllers/music/songs.js b/src/controllers/music/songs.js
index d30c74deb8..3fc7549947 100644
--- a/src/controllers/music/songs.js
+++ b/src/controllers/music/songs.js
@@ -1,11 +1,13 @@
-import events from 'events';
-import libraryBrowser from 'libraryBrowser';
-import imageLoader from 'imageLoader';
-import listView from 'listView';
-import loading from 'loading';
-import * as userSettings from 'userSettings';
-import globalize from 'globalize';
-import 'emby-itemscontainer';
+
+import { Events } from 'jellyfin-apiclient';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import imageLoader from '../../components/images/imageLoader';
+import listView from '../../components/listview/listview';
+import loading from '../../components/loading/loading';
+import * as userSettings from '../../scripts/settings/userSettings';
+import globalize from '../../scripts/globalize';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
+import Dashboard from '../../scripts/clientUtils';
/* eslint-disable indent */
@@ -119,7 +121,7 @@ import 'emby-itemscontainer';
loading.hide();
isLoading = false;
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(page);
});
});
@@ -130,13 +132,13 @@ import 'emby-itemscontainer';
let isLoading = false;
self.showFilterMenu = function () {
- import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
+ import('../../components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
const filterDialog = new filterDialogFactory({
query: getQuery(tabContent),
mode: 'songs',
serverId: ApiClient.serverId()
});
- events.on(filterDialog, 'filterchange', function () {
+ Events.on(filterDialog, 'filterchange', function () {
getQuery(tabContent).StartIndex = 0;
reloadItems(tabContent);
});
diff --git a/src/controllers/playback/queue/index.js b/src/controllers/playback/queue/index.js
index 581b5f4b8a..8bece4eb3f 100644
--- a/src/controllers/playback/queue/index.js
+++ b/src/controllers/playback/queue/index.js
@@ -1,6 +1,6 @@
-import remotecontrolFactory from 'components/remotecontrol/remotecontrol';
-import libraryMenu from 'libraryMenu';
-import 'emby-button';
+import remotecontrolFactory from '../../../components/remotecontrol/remotecontrol';
+import libraryMenu from '../../../scripts/libraryMenu';
+import '../../../elements/emby-button/emby-button';
export default function (view, params) {
const remoteControl = new remotecontrolFactory();
diff --git a/src/controllers/playback/video/index.html b/src/controllers/playback/video/index.html
index 6651fc3da2..26407cf95e 100644
--- a/src/controllers/playback/video/index.html
+++ b/src/controllers/playback/video/index.html
@@ -13,11 +13,11 @@
@@ -46,8 +46,6 @@
-
-
diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js
index 492f4aeee9..0cc37fa985 100644
--- a/src/controllers/playback/video/index.js
+++ b/src/controllers/playback/video/index.js
@@ -1,22 +1,26 @@
-import playbackManager from 'playbackManager';
-import dom from 'dom';
-import inputManager from 'inputManager';
-import mouseManager from 'mouseManager';
-import datetime from 'datetime';
-import itemHelper from 'itemHelper';
-import mediaInfo from 'mediaInfo';
-import focusManager from 'focusManager';
-import events from 'events';
-import browser from 'browser';
-import globalize from 'globalize';
-import appHost from 'apphost';
-import layoutManager from 'layoutManager';
-import * as userSettings from 'userSettings';
-import keyboardnavigation from 'keyboardnavigation';
-import 'scrollStyles';
-import 'emby-slider';
-import 'paper-icon-button-light';
-import 'css!assets/css/videoosd';
+import { playbackManager } from '../../../components/playback/playbackmanager';
+import dom from '../../../scripts/dom';
+import inputManager from '../../../scripts/inputManager';
+import mouseManager from '../../../scripts/mouseManager';
+import datetime from '../../../scripts/datetime';
+import itemHelper from '../../../components/itemHelper';
+import mediaInfo from '../../../components/mediainfo/mediainfo';
+import focusManager from '../../../components/focusManager';
+import { Events } from 'jellyfin-apiclient';
+import browser from '../../../scripts/browser';
+import globalize from '../../../scripts/globalize';
+import { appHost } from '../../../components/apphost';
+import layoutManager from '../../../components/layoutManager';
+import * as userSettings from '../../../scripts/settings/userSettings';
+import keyboardnavigation from '../../../scripts/keyboardNavigation';
+import '../../../assets/css/scrollstyles.css';
+import '../../../elements/emby-slider/emby-slider';
+import '../../../elements/emby-button/paper-icon-button-light';
+import '../../../assets/css/videoosd.css';
+import ServerConnections from '../../../components/ServerConnections';
+import shell from '../../../scripts/shell';
+import SubtitleSync from '../../../components/subtitlesync/subtitlesync';
+import { appRouter } from '../../../components/appRouter';
/* eslint-disable indent */
@@ -73,7 +77,7 @@ import 'css!assets/css/videoosd';
function getDisplayItem(item) {
if (item.Type === 'TvChannel') {
- const apiClient = window.connectionManager.getApiClient(item.ServerId);
+ const apiClient = ServerConnections.getApiClient(item.ServerId);
return apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (refreshedItem) {
return {
originalItem: refreshedItem,
@@ -97,9 +101,9 @@ import 'css!assets/css/videoosd';
return void view.querySelector('.btnRecord').classList.add('hide');
}
- window.connectionManager.getApiClient(item.ServerId).getCurrentUser().then(function (user) {
+ ServerConnections.getApiClient(item.ServerId).getCurrentUser().then(function (user) {
if (user.Policy.EnableLiveTvManagement) {
- import('recordingButton').then(({default: RecordingButton}) => {
+ import('../../../components/recordingcreator/recordingbutton').then(({default: RecordingButton}) => {
if (recordingButtonManager) {
return void recordingButtonManager.refreshItem(item);
}
@@ -190,7 +194,7 @@ import 'css!assets/css/videoosd';
currentItem = item;
if (!item) {
updateRecordingButton(null);
- Emby.Page.setTitle('');
+ appRouter.setTitle('');
nowPlayingVolumeSlider.disabled = true;
nowPlayingPositionSlider.disabled = true;
btnFastForward.disabled = true;
@@ -238,7 +242,7 @@ import 'css!assets/css/videoosd';
itemName = parentName || '';
}
- Emby.Page.setTitle(itemName);
+ appRouter.setTitle(itemName);
const documentTitle = parentName || (item ? item.Name : null);
@@ -510,7 +514,7 @@ import 'css!assets/css/videoosd';
if (state.NextMediaType !== 'Video') {
view.removeEventListener('viewbeforehide', onViewHideStopPlayback);
- Emby.Page.back();
+ appRouter.back();
}
}
@@ -540,16 +544,16 @@ import 'css!assets/css/videoosd';
onStateChanged.call(player, {
type: 'init'
}, state);
- events.on(player, 'playbackstart', onPlaybackStart);
- events.on(player, 'playbackstop', onPlaybackStopped);
- events.on(player, 'volumechange', onVolumeChanged);
- events.on(player, 'pause', onPlayPauseStateChanged);
- events.on(player, 'unpause', onPlayPauseStateChanged);
- events.on(player, 'timeupdate', onTimeUpdate);
- events.on(player, 'fullscreenchange', updateFullscreenIcon);
- events.on(player, 'mediastreamschange', onMediaStreamsChanged);
- events.on(player, 'beginFetch', onBeginFetch);
- events.on(player, 'endFetch', onEndFetch);
+ Events.on(player, 'playbackstart', onPlaybackStart);
+ Events.on(player, 'playbackstop', onPlaybackStopped);
+ Events.on(player, 'volumechange', onVolumeChanged);
+ Events.on(player, 'pause', onPlayPauseStateChanged);
+ Events.on(player, 'unpause', onPlayPauseStateChanged);
+ Events.on(player, 'timeupdate', onTimeUpdate);
+ Events.on(player, 'fullscreenchange', updateFullscreenIcon);
+ Events.on(player, 'mediastreamschange', onMediaStreamsChanged);
+ Events.on(player, 'beginFetch', onBeginFetch);
+ Events.on(player, 'endFetch', onEndFetch);
resetUpNextDialog();
if (player.isFetching) {
@@ -564,14 +568,14 @@ import 'css!assets/css/videoosd';
const player = currentPlayer;
if (player) {
- events.off(player, 'playbackstart', onPlaybackStart);
- events.off(player, 'playbackstop', onPlaybackStopped);
- events.off(player, 'volumechange', onVolumeChanged);
- events.off(player, 'pause', onPlayPauseStateChanged);
- events.off(player, 'unpause', onPlayPauseStateChanged);
- events.off(player, 'timeupdate', onTimeUpdate);
- events.off(player, 'fullscreenchange', updateFullscreenIcon);
- events.off(player, 'mediastreamschange', onMediaStreamsChanged);
+ Events.off(player, 'playbackstart', onPlaybackStart);
+ Events.off(player, 'playbackstop', onPlaybackStopped);
+ Events.off(player, 'volumechange', onVolumeChanged);
+ Events.off(player, 'pause', onPlayPauseStateChanged);
+ Events.off(player, 'unpause', onPlayPauseStateChanged);
+ Events.off(player, 'timeupdate', onTimeUpdate);
+ Events.off(player, 'fullscreenchange', updateFullscreenIcon);
+ Events.off(player, 'mediastreamschange', onMediaStreamsChanged);
currentPlayer = null;
}
}
@@ -613,7 +617,7 @@ import 'css!assets/css/videoosd';
}
function showComingUpNext(player) {
- import('upNextDialog').then(({default: UpNextDialog}) => {
+ import('../../../components/upnextdialog/upnextdialog').then(({default: UpNextDialog}) => {
if (!(currentVisibleMenu || currentUpNextDialog)) {
currentVisibleMenu = 'upnext';
comingUpNextDisplayed = true;
@@ -623,7 +627,7 @@ import 'css!assets/css/videoosd';
player: player,
nextItem: nextItem
});
- events.on(currentUpNextDialog, 'hide', onUpNextHidden);
+ Events.on(currentUpNextDialog, 'hide', onUpNextHidden);
}, onUpNextHidden);
}
});
@@ -760,7 +764,7 @@ import 'css!assets/css/videoosd';
}
if (runtimeTicks && positionTicks != null && currentRuntimeTicks && !enableProgressByTimeOfDay && currentItem.RunTimeTicks && currentItem.Type !== 'Recording') {
- endsAtText.innerHTML = ' - ' + mediaInfo.getEndsAtFromPosition(runtimeTicks, positionTicks, true);
+ endsAtText.innerHTML = ' ' + mediaInfo.getEndsAtFromPosition(runtimeTicks, positionTicks, true);
} else {
endsAtText.innerHTML = '';
}
@@ -770,8 +774,20 @@ import 'css!assets/css/videoosd';
nowPlayingPositionSlider.setBufferedRanges(bufferedRanges, runtimeTicks, positionTicks);
}
- updateTimeText(nowPlayingPositionText, positionTicks);
- updateTimeText(nowPlayingDurationText, runtimeTicks, true);
+ if (positionTicks >= 0) {
+ updateTimeText(nowPlayingPositionText, positionTicks);
+ nowPlayingPositionText.classList.remove('hide');
+ } else {
+ nowPlayingPositionText.classList.add('hide');
+ }
+
+ const leftTicks = runtimeTicks - positionTicks;
+ if (leftTicks >= 0) {
+ updateTimeText(nowPlayingDurationText, leftTicks);
+ nowPlayingDurationText.classList.remove('hide');
+ } else {
+ nowPlayingPositionText.classList.add('hide');
+ }
}
}
@@ -852,7 +868,7 @@ import 'css!assets/css/videoosd';
function onSettingsButtonClick(e) {
const btn = this;
- import('playerSettingsMenu').then(({default: playerSettingsMenu}) => {
+ import('../../../components/playback/playersettingsmenu').then((playerSettingsMenu) => {
const player = currentPlayer;
if (player) {
@@ -889,7 +905,7 @@ import 'css!assets/css/videoosd';
}
function toggleStats() {
- import('playerStats').then(({default: PlayerStats}) => {
+ import('../../../components/playerstats/playerstats').then(({default: PlayerStats}) => {
const player = currentPlayer;
if (player) {
@@ -929,7 +945,7 @@ import 'css!assets/css/videoosd';
});
const positionTo = this;
- import('actionsheet').then(({default: actionsheet}) => {
+ import('../../../components/actionSheet/actionSheet').then(({default: actionsheet}) => {
actionsheet.show({
items: menuItems,
title: globalize.translate('Audio'),
@@ -975,7 +991,7 @@ import 'css!assets/css/videoosd';
});
const positionTo = this;
- import('actionsheet').then(({default: actionsheet}) => {
+ import('../../../components/actionSheet/actionSheet').then(({default: actionsheet}) => {
actionsheet.show({
title: globalize.translate('Subtitles'),
items: menuItems,
@@ -997,14 +1013,12 @@ import 'css!assets/css/videoosd';
}
function toggleSubtitleSync(action) {
- import('subtitleSync').then(({default: SubtitleSync}) => {
- const player = currentPlayer;
- if (subtitleSyncOverlay) {
- subtitleSyncOverlay.toggle(action);
- } else if (player) {
- subtitleSyncOverlay = new SubtitleSync(player);
- }
- });
+ const player = currentPlayer;
+ if (subtitleSyncOverlay) {
+ subtitleSyncOverlay.toggle(action);
+ } else if (player) {
+ subtitleSyncOverlay = new SubtitleSync(player);
+ }
}
function destroySubtitleSync() {
@@ -1228,9 +1242,7 @@ import 'css!assets/css/videoosd';
let playPauseClickTimeout;
function onViewHideStopPlayback() {
if (playbackManager.isPlayingVideo()) {
- import('shell').then(({default: shell}) => {
- shell.disableFullscreen();
- });
+ shell.disableFullscreen();
clearTimeout(playPauseClickTimeout);
const player = currentPlayer;
@@ -1248,9 +1260,7 @@ import 'css!assets/css/videoosd';
}
}
- import('shell').then(({default: shell}) => {
- shell.enableFullscreen();
- });
+ shell.enableFullscreen();
let currentPlayer;
let comingUpNextDisplayed;
@@ -1295,11 +1305,11 @@ import 'css!assets/css/videoosd';
view.addEventListener('viewbeforeshow', function (e) {
headerElement.classList.add('osdHeader');
- Emby.Page.setTransparency('full');
+ appRouter.setTransparency('full');
});
view.addEventListener('viewshow', function (e) {
try {
- events.on(playbackManager, 'playerchange', onPlayerChange);
+ Events.on(playbackManager, 'playerchange', onPlayerChange);
bindToPlayer(playbackManager.getCurrentPlayer());
/* eslint-disable-next-line compat/compat */
dom.addEventListener(document, window.PointerEvent ? 'pointermove' : 'mousemove', onPointerMove, {
@@ -1337,9 +1347,7 @@ import 'css!assets/css/videoosd';
passive: true
});
} catch (e) {
- import('appRouter').then(({default: appRouter}) => {
- appRouter.goHome();
- });
+ appRouter.goHome();
}
});
view.addEventListener('viewbeforehide', function () {
@@ -1384,7 +1392,7 @@ import 'css!assets/css/videoosd';
passive: true
});
inputManager.off(window, onInputCommand);
- events.off(playbackManager, 'playerchange', onPlayerChange);
+ Events.off(playbackManager, 'playerchange', onPlayerChange);
releaseCurrentPlayer();
});
view.querySelector('.btnFullscreen').addEventListener('click', function () {
@@ -1515,7 +1523,7 @@ import 'css!assets/css/videoosd';
const item = currentItem;
if (item && item.Chapters && item.Chapters.length && item.Chapters[0].ImageTag) {
- const html = getChapterBubbleHtml(window.connectionManager.getApiClient(item.ServerId), item, item.Chapters, ticks);
+ const html = getChapterBubbleHtml(ServerConnections.getApiClient(item.ServerId), item, item.Chapters, ticks);
if (html) {
return html;
@@ -1548,15 +1556,15 @@ import 'css!assets/css/videoosd';
if (browser.touch) {
(function () {
- import('touchHelper').then(({default: TouchHelper}) => {
+ import('../../../scripts/touchHelper').then(({default: TouchHelper}) => {
self.touchHelper = new TouchHelper(view, {
swipeYThreshold: 30,
triggerOnMove: true,
preventDefaultOnMove: true,
ignoreTagNames: ['BUTTON', 'INPUT', 'TEXTAREA']
});
- events.on(self.touchHelper, 'swipeup', onVerticalSwipe);
- events.on(self.touchHelper, 'swipedown', onVerticalSwipe);
+ Events.on(self.touchHelper, 'swipeup', onVerticalSwipe);
+ Events.on(self.touchHelper, 'swipedown', onVerticalSwipe);
});
})();
}
diff --git a/src/controllers/searchpage.js b/src/controllers/searchpage.js
index ffb7fbac0b..b96c6f4b10 100644
--- a/src/controllers/searchpage.js
+++ b/src/controllers/searchpage.js
@@ -1,6 +1,6 @@
-import SearchFields from 'searchFields';
-import SearchResults from 'searchResults';
-import events from 'events';
+import SearchFields from '../components/search/searchfields';
+import SearchResults from '../components/search/searchresults';
+import { Events } from 'jellyfin-apiclient';
export default function (view, params) {
function onSearch(e, value) {
@@ -19,7 +19,7 @@ export default function (view, params) {
parentId: params.parentId,
collectionType: params.collectionType
});
- events.on(self.searchFields, 'search', onSearch);
+ Events.on(self.searchFields, 'search', onSearch);
}
});
view.addEventListener('viewdestroy', function () {
diff --git a/src/controllers/session/addServer/index.js b/src/controllers/session/addServer/index.js
index 472d1274a9..aabfdbcca8 100644
--- a/src/controllers/session/addServer/index.js
+++ b/src/controllers/session/addServer/index.js
@@ -1,7 +1,9 @@
-import appSettings from 'appSettings';
-import loading from 'loading';
-import globalize from 'globalize';
-import 'emby-button';
+import appSettings from '../../../scripts/settings/appSettings';
+import loading from '../../../components/loading/loading';
+import globalize from '../../../scripts/globalize';
+import '../../../elements/emby-button/emby-button';
+import Dashboard from '../../../scripts/clientUtils';
+import ServerConnections from '../../../components/ServerConnections';
/* eslint-disable indent */
@@ -36,7 +38,7 @@ import 'emby-button';
function submitServer(page) {
loading.show();
const host = page.querySelector('#txtServerHost').value;
- window.connectionManager.connectToAddress(host, {
+ ServerConnections.connectToAddress(host, {
enableAutoLogin: appSettings.enableAutoLogin()
}).then(function(result) {
handleConnectionResult(page, result);
@@ -51,7 +53,7 @@ import 'emby-button';
view.querySelector('.addServerForm').addEventListener('submit', onServerSubmit);
view.querySelector('.btnCancel').addEventListener('click', goBack);
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(view);
});
@@ -62,7 +64,7 @@ import 'emby-button';
}
function goBack() {
- import('appRouter').then(({default: appRouter}) => {
+ import('../../../components/appRouter').then(({default: appRouter}) => {
appRouter.back();
});
}
diff --git a/src/controllers/session/forgotPassword/index.js b/src/controllers/session/forgotPassword/index.js
index 5b92e255da..203605b8bb 100644
--- a/src/controllers/session/forgotPassword/index.js
+++ b/src/controllers/session/forgotPassword/index.js
@@ -1,4 +1,5 @@
-import globalize from 'globalize';
+import globalize from '../../../scripts/globalize';
+import Dashboard from '../../../scripts/clientUtils';
/* eslint-disable indent */
diff --git a/src/controllers/session/login/index.js b/src/controllers/session/login/index.js
index 1592e6b112..35191a1954 100644
--- a/src/controllers/session/login/index.js
+++ b/src/controllers/session/login/index.js
@@ -1,13 +1,16 @@
-import appHost from 'apphost';
-import appSettings from 'appSettings';
-import dom from 'dom';
-import loading from 'loading';
-import layoutManager from 'layoutManager';
-import libraryMenu from 'libraryMenu';
-import browser from 'browser';
-import globalize from 'globalize';
-import 'cardStyle';
-import 'emby-checkbox';
+import { appHost } from '../../../components/apphost';
+import appSettings from '../../../scripts/settings/appSettings';
+import dom from '../../../scripts/dom';
+import loading from '../../../components/loading/loading';
+import layoutManager from '../../../components/layoutManager';
+import libraryMenu from '../../../scripts/libraryMenu';
+import browser from '../../../scripts/browser';
+import globalize from '../../../scripts/globalize';
+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 */
@@ -27,10 +30,8 @@ import 'emby-checkbox';
const UnauthorizedOrForbidden = [401, 403];
if (UnauthorizedOrForbidden.includes(response.status)) {
- import('toast').then(({default: toast}) => {
- const messageKey = response.status === 401 ? 'MessageInvalidUser' : 'MessageUnauthorizedUser';
- toast(globalize.translate(messageKey));
- });
+ const messageKey = response.status === 401 ? 'MessageInvalidUser' : 'MessageUnauthorizedUser';
+ toast(globalize.translate(messageKey));
} else {
Dashboard.alert({
message: globalize.translate('MessageUnableToConnectToServer'),
@@ -191,7 +192,7 @@ import 'emby-checkbox';
const serverId = params.serverid;
if (serverId) {
- return window.connectionManager.getOrCreateApiClient(serverId);
+ return ServerConnections.getOrCreateApiClient(serverId);
}
return ApiClient;
@@ -202,7 +203,7 @@ import 'emby-checkbox';
view.querySelector('.manualLoginForm').classList.add('hide');
view.querySelector('.btnManual').classList.remove('hide');
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(view);
});
}
diff --git a/src/controllers/session/resetPassword/index.js b/src/controllers/session/resetPassword/index.js
index d4f7df5bbd..cc84d76fae 100644
--- a/src/controllers/session/resetPassword/index.js
+++ b/src/controllers/session/resetPassword/index.js
@@ -1,4 +1,5 @@
-import globalize from 'globalize';
+import globalize from '../../../scripts/globalize';
+import Dashboard from '../../../scripts/clientUtils';
/* eslint-disable indent */
diff --git a/src/controllers/session/selectServer/index.js b/src/controllers/session/selectServer/index.js
index 6a590fc318..32674a8062 100644
--- a/src/controllers/session/selectServer/index.js
+++ b/src/controllers/session/selectServer/index.js
@@ -1,19 +1,22 @@
-import loading from 'loading';
-import appRouter from 'appRouter';
-import layoutManager from 'layoutManager';
-import libraryMenu from 'libraryMenu';
-import appSettings from 'appSettings';
-import focusManager from 'focusManager';
-import globalize from 'globalize';
-import actionSheet from 'actionsheet';
-import dom from 'dom';
-import browser from 'browser';
-import 'material-icons';
-import 'flexStyles';
-import 'emby-scroller';
-import 'emby-itemscontainer';
-import 'cardStyle';
-import 'emby-button';
+import loading from '../../../components/loading/loading';
+import { appRouter } from '../../../components/appRouter';
+import layoutManager from '../../../components/layoutManager';
+import libraryMenu from '../../../scripts/libraryMenu';
+import appSettings from '../../../scripts/settings/appSettings';
+import focusManager from '../../../components/focusManager';
+import globalize from '../../../scripts/globalize';
+import actionSheet from '../../../components/actionSheet/actionSheet';
+import dom from '../../../scripts/dom';
+import browser from '../../../scripts/browser';
+import 'material-design-icons-iconfont';
+import '../../../assets/css/flexstyles.scss';
+import '../../../elements/emby-scroller/emby-scroller';
+import '../../../elements/emby-itemscontainer/emby-itemscontainer';
+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 */
@@ -100,9 +103,7 @@ import 'emby-button';
}
function alertTextWithOptions(options) {
- import('alert').then(({default: alert}) => {
- alert(options);
- });
+ alert(options);
}
function showServerConnectionFailure() {
@@ -112,7 +113,7 @@ import 'emby-button';
export default function (view, params) {
function connectToServer(server) {
loading.show();
- window.connectionManager.connectToServer(server, {
+ ServerConnections.connectToServer(server, {
enableAutoLogin: appSettings.enableAutoLogin()
}).then(function (result) {
loading.hide();
@@ -144,7 +145,7 @@ import 'emby-button';
function deleteServer(server) {
loading.show();
- window.connectionManager.deleteServer(server.Id).then(function () {
+ ServerConnections.deleteServer(server.Id).then(function () {
loading.hide();
loadServers();
});
@@ -186,7 +187,7 @@ import 'emby-button';
function loadServers() {
loading.show();
- window.connectionManager.getAvailableServers().then(onServersRetrieved);
+ ServerConnections.getAvailableServers().then(onServersRetrieved);
}
let servers;
diff --git a/src/controllers/shows/episodes.js b/src/controllers/shows/episodes.js
index 6dd633d7b0..3dd08e3f76 100644
--- a/src/controllers/shows/episodes.js
+++ b/src/controllers/shows/episodes.js
@@ -1,12 +1,13 @@
-import loading from 'loading';
-import events from 'events';
-import libraryBrowser from 'libraryBrowser';
-import imageLoader from 'imageLoader';
-import listView from 'listView';
-import cardBuilder from 'cardBuilder';
-import * as userSettings from 'userSettings';
-import globalize from 'globalize';
-import 'emby-itemscontainer';
+import loading from '../../components/loading/loading';
+import { Events } from 'jellyfin-apiclient';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import imageLoader from '../../components/images/imageLoader';
+import listView from '../../components/listview/listview';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import * as userSettings from '../../scripts/settings/userSettings';
+import globalize from '../../scripts/globalize';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
+import Dashboard from '../../scripts/clientUtils';
/* eslint-disable indent */
@@ -160,7 +161,7 @@ import 'emby-itemscontainer';
loading.hide();
isLoading = false;
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(page);
});
});
@@ -171,13 +172,13 @@ import 'emby-itemscontainer';
let isLoading = false;
self.showFilterMenu = function () {
- import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
+ import('../../components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
const filterDialog = new filterDialogFactory({
query: getQuery(tabContent),
mode: 'episodes',
serverId: ApiClient.serverId()
});
- events.on(filterDialog, 'filterchange', function () {
+ Events.on(filterDialog, 'filterchange', function () {
reloadItems(tabContent);
});
filterDialog.show();
diff --git a/src/controllers/shows/tvgenres.js b/src/controllers/shows/tvgenres.js
index 3a17fd7997..b29898730b 100644
--- a/src/controllers/shows/tvgenres.js
+++ b/src/controllers/shows/tvgenres.js
@@ -1,11 +1,11 @@
-import layoutManager from 'layoutManager';
-import loading from 'loading';
-import libraryBrowser from 'libraryBrowser';
-import cardBuilder from 'cardBuilder';
-import lazyLoader from 'lazyLoader';
-import globalize from 'globalize';
-import appRouter from 'appRouter';
-import 'emby-button';
+import layoutManager from '../../components/layoutManager';
+import loading from '../../components/loading/loading';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import lazyLoader from '../../components/lazyLoader/lazyLoaderIntersectionObserver';
+import globalize from '../../scripts/globalize';
+import { appRouter } from '../../components/appRouter';
+import '../../elements/emby-button/emby-button';
/* eslint-disable indent */
@@ -17,7 +17,7 @@ import 'emby-button';
if (!pageData) {
pageData = data[key] = {
query: {
- SortBy: 'SortName',
+ SortBy: 'Random',
SortOrder: 'Ascending',
IncludeItemTypes: 'Series',
Recursive: true,
diff --git a/src/controllers/shows/tvrecommended.js b/src/controllers/shows/tvrecommended.js
index db7bef2d50..c028a118d8 100644
--- a/src/controllers/shows/tvrecommended.js
+++ b/src/controllers/shows/tvrecommended.js
@@ -1,17 +1,20 @@
-import events from 'events';
-import inputManager from 'inputManager';
-import libraryMenu from 'libraryMenu';
-import layoutManager from 'layoutManager';
-import loading from 'loading';
-import dom from 'dom';
-import * as userSettings from 'userSettings';
-import cardBuilder from 'cardBuilder';
-import playbackManager from 'playbackManager';
-import * as mainTabsManager from 'mainTabsManager';
-import globalize from 'globalize';
-import 'scrollStyles';
-import 'emby-itemscontainer';
-import 'emby-button';
+
+import { Events } from 'jellyfin-apiclient';
+import inputManager from '../../scripts/inputManager';
+import libraryMenu from '../../scripts/libraryMenu';
+import layoutManager from '../../components/layoutManager';
+import loading from '../../components/loading/loading';
+import dom from '../../scripts/dom';
+import * as userSettings from '../../scripts/settings/userSettings';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import { playbackManager } from '../../components/playback/playbackmanager';
+import * as mainTabsManager from '../../components/maintabsmanager';
+import globalize from '../../scripts/globalize';
+import '../../assets/css/scrollstyles.css';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
+import '../../elements/emby-button/emby-button';
+import Dashboard from '../../scripts/clientUtils';
+import autoFocuser from '../../components/autoFocuser';
/* eslint-disable indent */
@@ -127,9 +130,7 @@ import 'emby-button';
});
loading.hide();
- import('autoFocuser').then(({default: autoFocuser}) => {
- autoFocuser.autoFocus(view);
- });
+ autoFocuser.autoFocus(view);
});
}
@@ -168,9 +169,7 @@ import 'emby-button';
});
loading.hide();
- import('autoFocuser').then(({default: autoFocuser}) => {
- autoFocuser.autoFocus(view);
- });
+ autoFocuser.autoFocus(view);
});
}
@@ -209,9 +208,7 @@ import 'emby-button';
});
loading.hide();
- import('autoFocuser').then(({default: autoFocuser}) => {
- autoFocuser.autoFocus(view);
- });
+ autoFocuser.autoFocus(view);
});
}
@@ -246,31 +243,31 @@ import 'emby-button';
switch (index) {
case 0:
- depends = 'controllers/shows/tvshows';
+ depends = 'tvshows';
break;
case 1:
- depends = 'controllers/shows/tvrecommended';
+ depends = 'tvrecommended';
break;
case 2:
- depends = 'controllers/shows/tvupcoming';
+ depends = 'tvupcoming';
break;
case 3:
- depends = 'controllers/shows/tvgenres';
+ depends = 'tvgenres';
break;
case 4:
- depends = 'controllers/shows/tvstudios';
+ depends = 'tvstudios';
break;
case 5:
- depends = 'controllers/shows/episodes';
+ depends = 'episodes';
break;
}
- import(depends).then(({default: controllerFactory}) => {
+ import(`../shows/${depends}`).then(({default: controllerFactory}) => {
let tabContent;
if (index === 1) {
@@ -373,14 +370,14 @@ import 'emby-button';
}
}
- events.on(playbackManager, 'playbackstop', onPlaybackStop);
- events.on(ApiClient, 'message', onWebSocketMessage);
+ Events.on(playbackManager, 'playbackstop', onPlaybackStop);
+ Events.on(ApiClient, 'message', onWebSocketMessage);
inputManager.on(window, onInputCommand);
});
view.addEventListener('viewbeforehide', function (e) {
inputManager.off(window, onInputCommand);
- events.off(playbackManager, 'playbackstop', onPlaybackStop);
- events.off(ApiClient, 'message', onWebSocketMessage);
+ Events.off(playbackManager, 'playbackstop', onPlaybackStop);
+ Events.off(ApiClient, 'message', onWebSocketMessage);
});
view.addEventListener('viewdestroy', function (e) {
tabControllers.forEach(function (t) {
diff --git a/src/controllers/shows/tvshows.js b/src/controllers/shows/tvshows.js
index 949c994606..7ef60e21db 100644
--- a/src/controllers/shows/tvshows.js
+++ b/src/controllers/shows/tvshows.js
@@ -1,13 +1,13 @@
-import loading from 'loading';
-import events from 'events';
-import libraryBrowser from 'libraryBrowser';
-import imageLoader from 'imageLoader';
-import listView from 'listView';
-import cardBuilder from 'cardBuilder';
-import AlphaPicker from 'alphaPicker';
-import * as userSettings from 'userSettings';
-import globalize from 'globalize';
-import 'emby-itemscontainer';
+import loading from '../../components/loading/loading';
+import { Events } from 'jellyfin-apiclient';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import imageLoader from '../../components/images/imageLoader';
+import listView from '../../components/listview/listview';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import AlphaPicker from '../../components/alphaPicker/alphaPicker';
+import * as userSettings from '../../scripts/settings/userSettings';
+import globalize from '../../scripts/globalize';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
/* eslint-disable indent */
@@ -190,7 +190,7 @@ import 'emby-itemscontainer';
loading.hide();
isLoading = false;
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(page);
});
});
@@ -214,13 +214,13 @@ import 'emby-itemscontainer';
let isLoading = false;
this.showFilterMenu = function () {
- import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
+ import('../../components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
const filterDialog = new filterDialogFactory({
query: getQuery(tabContent),
mode: 'series',
serverId: ApiClient.serverId()
});
- events.on(filterDialog, 'filterchange', function () {
+ Events.on(filterDialog, 'filterchange', function () {
getQuery(tabContent).StartIndex = 0;
reloadItems(tabContent);
});
diff --git a/src/controllers/shows/tvstudios.js b/src/controllers/shows/tvstudios.js
index 4be717fb7f..5a0276e5f4 100644
--- a/src/controllers/shows/tvstudios.js
+++ b/src/controllers/shows/tvstudios.js
@@ -1,6 +1,6 @@
-import loading from 'loading';
-import libraryBrowser from 'libraryBrowser';
-import cardBuilder from 'cardBuilder';
+import loading from '../../components/loading/loading';
+import libraryBrowser from '../../scripts/libraryBrowser';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
/* eslint-disable indent */
@@ -50,7 +50,7 @@ import cardBuilder from 'cardBuilder';
});
loading.hide();
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(context);
});
});
diff --git a/src/controllers/shows/tvupcoming.js b/src/controllers/shows/tvupcoming.js
index f9df3df343..897c02b5a8 100644
--- a/src/controllers/shows/tvupcoming.js
+++ b/src/controllers/shows/tvupcoming.js
@@ -1,11 +1,11 @@
-import layoutManager from 'layoutManager';
-import loading from 'loading';
-import datetime from 'datetime';
-import cardBuilder from 'cardBuilder';
-import imageLoader from 'imageLoader';
-import globalize from 'globalize';
-import 'scrollStyles';
-import 'emby-itemscontainer';
+import layoutManager from '../../components/layoutManager';
+import loading from '../../components/loading/loading';
+import datetime from '../../scripts/datetime';
+import cardBuilder from '../../components/cardbuilder/cardBuilder';
+import imageLoader from '../../components/images/imageLoader';
+import globalize from '../../scripts/globalize';
+import '../../assets/css/scrollstyles.css';
+import '../../elements/emby-itemscontainer/emby-itemscontainer';
/* eslint-disable indent */
diff --git a/src/controllers/user/display/index.js b/src/controllers/user/display/index.js
index 54f71ad571..322da73772 100644
--- a/src/controllers/user/display/index.js
+++ b/src/controllers/user/display/index.js
@@ -1,6 +1,6 @@
-import DisplaySettings from 'displaySettings';
-import * as userSettings from 'userSettings';
-import autoFocuser from 'autoFocuser';
+import DisplaySettings from '../../../components/displaySettings/displaySettings';
+import * as userSettings from '../../../scripts/settings/userSettings';
+import autoFocuser from '../../../components/autoFocuser';
/* eslint-disable indent */
diff --git a/src/controllers/user/home/index.js b/src/controllers/user/home/index.js
index 539365ff97..a1bb503adb 100644
--- a/src/controllers/user/home/index.js
+++ b/src/controllers/user/home/index.js
@@ -1,7 +1,7 @@
-import HomescreenSettings from 'homescreenSettings';
-import * as userSettings from 'userSettings';
-import autoFocuser from 'autoFocuser';
-import 'listViewStyle';
+import HomescreenSettings from '../../../components/homeScreenSettings/homeScreenSettings';
+import * as userSettings from '../../../scripts/settings/userSettings';
+import autoFocuser from '../../../components/autoFocuser';
+import '../../../components/listview/listview.css';
/* eslint-disable indent */
diff --git a/src/controllers/user/menu/index.js b/src/controllers/user/menu/index.js
index 88cf28a216..cfc5b5f4a5 100644
--- a/src/controllers/user/menu/index.js
+++ b/src/controllers/user/menu/index.js
@@ -1,7 +1,8 @@
-import appHost from 'apphost';
-import layoutManager from 'layoutManager';
-import 'listViewStyle';
-import 'emby-button';
+import { appHost } from '../../../components/apphost';
+import '../../../components/listview/listview.css';
+import '../../../elements/emby-button/emby-button';
+import layoutManager from '../../../components/layoutManager';
+import Dashboard from '../../../scripts/clientUtils';
export default function (view, params) {
view.querySelector('.btnLogout').addEventListener('click', function () {
@@ -53,7 +54,7 @@ export default function (view, params) {
page.querySelector('.adminSection').classList.add('hide');
}
- import('autoFocuser').then(({default: autoFocuser}) => {
+ import('../../../components/autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(view);
});
});
diff --git a/src/controllers/user/playback/index.js b/src/controllers/user/playback/index.js
index 34a5ae0b1d..a44e96ec10 100644
--- a/src/controllers/user/playback/index.js
+++ b/src/controllers/user/playback/index.js
@@ -1,7 +1,8 @@
-import PlaybackSettings from 'playbackSettings';
-import * as userSettings from 'userSettings';
-import autoFocuser from 'autoFocuser';
-import 'listViewStyle';
+
+import PlaybackSettings from '../../../components/playbackSettings/playbackSettings';
+import * as userSettings from '../../../scripts/settings/userSettings';
+import autoFocuser from '../../../components/autoFocuser';
+import '../../../components/listview/listview.css';
/* eslint-disable indent */
diff --git a/src/controllers/user/profile/index.js b/src/controllers/user/profile/index.js
index 631253d019..4398de36e2 100644
--- a/src/controllers/user/profile/index.js
+++ b/src/controllers/user/profile/index.js
@@ -1,9 +1,12 @@
-import UserPasswordPage from 'controllers/dashboard/users/userpasswordpage';
-import loading from 'loading';
-import libraryMenu from 'libraryMenu';
-import appHost from 'apphost';
-import globalize from 'globalize';
-import 'emby-button';
+import UserPasswordPage from '../../dashboard/users/userpasswordpage';
+import loading from '../../../components/loading/loading';
+import libraryMenu from '../../../scripts/libraryMenu';
+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');
@@ -40,26 +43,20 @@ function onFileReaderError(evt) {
loading.hide();
switch (evt.target.error.code) {
case evt.target.error.NOT_FOUND_ERR:
- import('toast').then(({default: toast}) => {
- toast(globalize.translate('FileNotFound'));
- });
+ toast(globalize.translate('FileNotFound'));
break;
case evt.target.error.ABORT_ERR:
onFileReaderAbort();
break;
case evt.target.error.NOT_READABLE_ERR:
default:
- import('toast').then(({default: toast}) => {
- toast(globalize.translate('FileReadError'));
- });
+ toast(globalize.translate('FileReadError'));
}
}
function onFileReaderAbort(evt) {
loading.hide();
- import('toast').then(({default: toast}) => {
- toast(globalize.translate('FileReadCancelled'));
- });
+ toast(globalize.translate('FileReadCancelled'));
}
function setFiles(page, files) {
@@ -89,14 +86,12 @@ export default function (view, params) {
reloadUser(view);
new UserPasswordPage(view, params);
view.querySelector('#btnDeleteImage').addEventListener('click', function () {
- import('confirm').then(({default: confirm}) => {
- confirm(globalize.translate('DeleteImageConfirmation'), globalize.translate('DeleteImage')).then(function () {
- loading.show();
- const userId = getParameterByName('userId');
- ApiClient.deleteUserImage(userId, 'primary').then(function () {
- loading.hide();
- reloadUser(view);
- });
+ confirm(globalize.translate('DeleteImageConfirmation'), globalize.translate('DeleteImage')).then(function () {
+ loading.show();
+ const userId = getParameterByName('userId');
+ ApiClient.deleteUserImage(userId, 'primary').then(function () {
+ loading.hide();
+ reloadUser(view);
});
});
});
diff --git a/src/controllers/user/quickConnect/index.js b/src/controllers/user/quickConnect/index.js
index 1600765ed5..162f3d9783 100644
--- a/src/controllers/user/quickConnect/index.js
+++ b/src/controllers/user/quickConnect/index.js
@@ -1,6 +1,6 @@
-import QuickConnectSettings from 'quickConnectSettings';
-import globalize from 'globalize';
-import toast from 'toast';
+import QuickConnectSettings from '../../../components/quickConnectSettings/quickConnectSettings';
+import globalize from '../../../scripts/globalize';
+import toast from '../../../components/toast/toast';
export default function (view) {
let quickConnectSettingsInstance = null;
diff --git a/src/controllers/user/subtitles/index.js b/src/controllers/user/subtitles/index.js
index efa2f1bead..deb86535df 100644
--- a/src/controllers/user/subtitles/index.js
+++ b/src/controllers/user/subtitles/index.js
@@ -1,6 +1,6 @@
-import SubtitleSettings from 'subtitleSettings';
-import * as userSettings from 'userSettings';
-import autoFocuser from 'autoFocuser';
+import SubtitleSettings from '../../../components/subtitlesettings/subtitlesettings';
+import * as userSettings from '../../../scripts/settings/userSettings';
+import autoFocuser from '../../../components/autoFocuser';
/* eslint-disable indent */
diff --git a/src/controllers/wizard/finish/index.js b/src/controllers/wizard/finish/index.js
index 5451d6665c..446d01e61c 100644
--- a/src/controllers/wizard/finish/index.js
+++ b/src/controllers/wizard/finish/index.js
@@ -1,4 +1,4 @@
-import loading from 'loading';
+import loading from '../../../components/loading/loading';
function onFinish() {
loading.show();
diff --git a/src/controllers/wizard/remote/index.js b/src/controllers/wizard/remote/index.js
index b967d668ad..c5689e73bb 100644
--- a/src/controllers/wizard/remote/index.js
+++ b/src/controllers/wizard/remote/index.js
@@ -1,7 +1,8 @@
-import loading from 'loading';
-import 'emby-checkbox';
-import 'emby-button';
-import 'emby-select';
+import loading from '../../../components/loading/loading';
+import '../../../elements/emby-checkbox/emby-checkbox';
+import '../../../elements/emby-button/emby-button';
+import '../../../elements/emby-select/emby-select';
+import Dashboard from '../../../scripts/clientUtils';
function save(page) {
loading.show();
diff --git a/src/controllers/wizard/settings/index.js b/src/controllers/wizard/settings/index.js
index 6e3a82cd9b..4a88e861f0 100644
--- a/src/controllers/wizard/settings/index.js
+++ b/src/controllers/wizard/settings/index.js
@@ -1,7 +1,8 @@
-import loading from 'loading';
-import 'emby-checkbox';
-import 'emby-button';
-import 'emby-select';
+import loading from '../../../components/loading/loading';
+import '../../../elements/emby-checkbox/emby-checkbox';
+import '../../../elements/emby-button/emby-button';
+import '../../../elements/emby-select/emby-select';
+import Dashboard from '../../../scripts/clientUtils';
function save(page) {
loading.show();
diff --git a/src/controllers/wizard/start/index.js b/src/controllers/wizard/start/index.js
index 3cd53b4ceb..3f524a870a 100644
--- a/src/controllers/wizard/start/index.js
+++ b/src/controllers/wizard/start/index.js
@@ -1,7 +1,8 @@
-import $ from 'jQuery';
-import loading from 'loading';
-import 'emby-button';
-import 'emby-select';
+import 'jquery';
+import loading from '../../../components/loading/loading';
+import '../../../elements/emby-button/emby-button';
+import '../../../elements/emby-select/emby-select';
+import Dashboard from '../../../scripts/clientUtils';
function loadPage(page, config, languageOptions) {
$('#selectLocalizationLanguage', page).html(languageOptions.map(function (l) {
diff --git a/src/controllers/wizard/user/index.js b/src/controllers/wizard/user/index.js
index ec587fec8e..03566ac7ee 100644
--- a/src/controllers/wizard/user/index.js
+++ b/src/controllers/wizard/user/index.js
@@ -1,8 +1,10 @@
-import loading from 'loading';
-import globalize from 'globalize';
-import 'dashboardcss';
-import 'emby-input';
-import 'emby-button';
+import loading from '../../../components/loading/loading';
+import globalize from '../../../scripts/globalize';
+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;
@@ -36,9 +38,7 @@ function onSubmit(e) {
const form = this;
if (form.querySelector('#txtManualPassword').value != form.querySelector('#txtPasswordConfirm').value) {
- import('toast').then(({default: toast}) => {
- toast(globalize.translate('PasswordMatchError'));
- });
+ toast(globalize.translate('PasswordMatchError'));
} else {
submit(form);
}
diff --git a/src/elements/emby-button/emby-button.js b/src/elements/emby-button/emby-button.js
index 213bbc8e7f..3d911c6e37 100644
--- a/src/elements/emby-button/emby-button.js
+++ b/src/elements/emby-button/emby-button.js
@@ -1,10 +1,10 @@
-import dom from 'dom';
-import layoutManager from 'layoutManager';
-import shell from 'shell';
-import appRouter from 'appRouter';
-import appHost from 'apphost';
-import 'css!./emby-button';
-import 'webcomponents';
+import 'webcomponents.js/webcomponents-lite';
+import { removeEventListener, addEventListener } from '../../scripts/dom';
+import layoutManager from '../../components/layoutManager';
+import shell from '../../scripts/shell';
+import { appRouter } from '../../components/appRouter';
+import { appHost } from '../../components/apphost';
+import './emby-button.css';
const EmbyButtonPrototype = Object.create(HTMLButtonElement.prototype);
const EmbyLinkButtonPrototype = Object.create(HTMLAnchorElement.prototype);
@@ -41,8 +41,8 @@ EmbyButtonPrototype.createdCallback = function () {
EmbyButtonPrototype.attachedCallback = function () {
if (this.tagName === 'A') {
- dom.removeEventListener(this, 'click', onAnchorClick, {});
- dom.addEventListener(this, 'click', onAnchorClick, {});
+ removeEventListener(this, 'click', onAnchorClick, {});
+ addEventListener(this, 'click', onAnchorClick, {});
if (this.getAttribute('data-autohide') === 'true') {
if (appHost.supports('externallinks')) {
@@ -55,7 +55,7 @@ EmbyButtonPrototype.attachedCallback = function () {
};
EmbyButtonPrototype.detachedCallback = function () {
- dom.removeEventListener(this, 'click', onAnchorClick, {});
+ removeEventListener(this, 'click', onAnchorClick, {});
};
EmbyLinkButtonPrototype.createdCallback = EmbyButtonPrototype.createdCallback;
diff --git a/src/elements/emby-button/paper-icon-button-light.js b/src/elements/emby-button/paper-icon-button-light.js
index f6c754fedb..ff817a31b4 100644
--- a/src/elements/emby-button/paper-icon-button-light.js
+++ b/src/elements/emby-button/paper-icon-button-light.js
@@ -1,6 +1,6 @@
-import layoutManager from 'layoutManager';
-import 'css!./emby-button';
-import 'webcomponents';
+import layoutManager from '../../components/layoutManager';
+import './emby-button.css';
+import 'webcomponents.js/webcomponents-lite';
const EmbyButtonPrototype = Object.create(HTMLButtonElement.prototype);
diff --git a/src/elements/emby-checkbox/emby-checkbox.js b/src/elements/emby-checkbox/emby-checkbox.js
index d44c58ed48..0af079ec06 100644
--- a/src/elements/emby-checkbox/emby-checkbox.js
+++ b/src/elements/emby-checkbox/emby-checkbox.js
@@ -1,7 +1,7 @@
-import browser from 'browser';
-import dom from 'dom';
-import 'css!./emby-checkbox';
-import 'webcomponents';
+import browser from '../../scripts/browser';
+import dom from '../../scripts/dom';
+import './emby-checkbox.css';
+import 'webcomponents.js/webcomponents-lite';
/* eslint-disable indent */
diff --git a/src/elements/emby-collapse/emby-collapse.js b/src/elements/emby-collapse/emby-collapse.js
index c87e73d48f..ca34a48554 100644
--- a/src/elements/emby-collapse/emby-collapse.js
+++ b/src/elements/emby-collapse/emby-collapse.js
@@ -1,6 +1,6 @@
-import 'css!./emby-collapse';
-import 'webcomponents';
-import 'emby-button';
+import './emby-collapse.css';
+import 'webcomponents.js/webcomponents-lite';
+import '../emby-button/emby-button';
/* eslint-disable indent */
diff --git a/src/elements/emby-input/emby-input.js b/src/elements/emby-input/emby-input.js
index 3a71e29a6f..60f459f32b 100644
--- a/src/elements/emby-input/emby-input.js
+++ b/src/elements/emby-input/emby-input.js
@@ -1,7 +1,7 @@
-import browser from 'browser';
-import dom from 'dom';
-import 'css!./emby-input';
-import 'webcomponents';
+import browser from '../../scripts/browser';
+import dom from '../../scripts/dom';
+import './emby-input.css';
+import 'webcomponents.js/webcomponents-lite';
/* eslint-disable indent */
diff --git a/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js b/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
index 51f3fc5be9..c3a15ce12e 100644
--- a/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
+++ b/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
@@ -1,21 +1,21 @@
-import EmbyProgressRing from 'emby-progressring';
-import dom from 'dom';
-import serverNotifications from 'serverNotifications';
-import events from 'events';
-import 'webcomponents';
+import EmbyProgressRing from '../emby-progressring/emby-progressring';
+import dom from '../../scripts/dom';
+import serverNotifications from '../../scripts/serverNotifications';
+import { Events } from 'jellyfin-apiclient';
+import 'webcomponents.js/webcomponents-lite';
/* eslint-disable indent */
function addNotificationEvent(instance, name, handler) {
const localHandler = handler.bind(instance);
- events.on(serverNotifications, name, localHandler);
+ Events.on(serverNotifications, name, localHandler);
instance[name] = localHandler;
}
function removeNotificationEvent(instance, name) {
const handler = instance[name];
if (handler) {
- events.off(serverNotifications, name, handler);
+ Events.off(serverNotifications, name, handler);
instance[name] = null;
}
}
diff --git a/src/elements/emby-itemscontainer/emby-itemscontainer.js b/src/elements/emby-itemscontainer/emby-itemscontainer.js
index 7d8f941603..3d84ea6bed 100644
--- a/src/elements/emby-itemscontainer/emby-itemscontainer.js
+++ b/src/elements/emby-itemscontainer/emby-itemscontainer.js
@@ -1,15 +1,17 @@
-import itemShortcuts from 'itemShortcuts';
-import inputManager from 'inputManager';
-import playbackManager from 'playbackManager';
-import imageLoader from 'imageLoader';
-import layoutManager from 'layoutManager';
-import browser from 'browser';
-import dom from 'dom';
-import loading from 'loading';
-import focusManager from 'focusManager';
-import serverNotifications from 'serverNotifications';
-import events from 'events';
-import 'webcomponents';
+import itemShortcuts from '../../components/shortcuts';
+import inputManager from '../../scripts/inputManager';
+import { playbackManager } from '../../components/playback/playbackmanager';
+import imageLoader from '../../components/images/imageLoader';
+import layoutManager from '../../components/layoutManager';
+import browser from '../../scripts/browser';
+import dom from '../../scripts/dom';
+import loading from '../../components/loading/loading';
+import focusManager from '../../components/focusManager';
+import serverNotifications from '../../scripts/serverNotifications';
+import { Events } from 'jellyfin-apiclient';
+import 'webcomponents.js/webcomponents-lite';
+import ServerConnections from '../../components/ServerConnections';
+import Sortable from 'sortablejs';
/* eslint-disable indent */
@@ -72,7 +74,7 @@ import 'webcomponents';
}
const self = this;
- import('multiSelect').then(({default: MultiSelect}) => {
+ import('../../components/multiSelect/multiSelect').then(({default: MultiSelect}) => {
self.multiSelect = new MultiSelect({
container: self,
bindOnClick: false
@@ -102,7 +104,7 @@ import 'webcomponents';
}
const serverId = el.getAttribute('data-serverid');
- const apiClient = window.connectionManager.getApiClient(serverId);
+ const apiClient = ServerConnections.getApiClient(serverId);
loading.show();
@@ -132,23 +134,21 @@ import 'webcomponents';
}
const self = this;
- import('sortable').then(({default: Sortable}) => {
- self.sortable = new Sortable(self, {
- draggable: '.listItem',
- handle: '.listViewDragHandle',
+ self.sortable = new Sortable(self, {
+ draggable: '.listItem',
+ handle: '.listViewDragHandle',
- // dragging ended
- onEnd: function (evt) {
- return onDrop(evt, self);
- }
- });
+ // dragging ended
+ onEnd: function (evt) {
+ return onDrop(evt, self);
+ }
});
};
function onUserDataChanged(e, apiClient, userData) {
const itemsContainer = this;
- import('cardBuilder').then(({default: cardBuilder}) => {
+ import('../../components/cardbuilder/cardBuilder').then((cardBuilder) => {
cardBuilder.onUserDataChanged(userData, itemsContainer);
});
@@ -183,7 +183,7 @@ import 'webcomponents';
// This could be null, not supported by all tv providers
const newTimerId = data.Id;
- import('cardBuilder').then(({default: cardBuilder}) => {
+ import('../../components/cardbuilder/cardBuilder').then((cardBuilder) => {
cardBuilder.onTimerCreated(programId, newTimerId, itemsContainer);
});
}
@@ -203,7 +203,7 @@ import 'webcomponents';
return;
}
- import('cardBuilder').then(({default: cardBuilder}) => {
+ import('../../components/cardbuilder/cardBuilder').then((cardBuilder) => {
cardBuilder.onTimerCancelled(data.Id, itemsContainer);
});
}
@@ -215,7 +215,7 @@ import 'webcomponents';
return;
}
- import('cardBuilder').then(({default: cardBuilder}) => {
+ import('../../components/cardbuilder/cardBuilder').then((cardBuilder) => {
cardBuilder.onSeriesTimerCancelled(data.Id, itemsContainer);
});
}
@@ -270,7 +270,7 @@ import 'webcomponents';
function addNotificationEvent(instance, name, handler, owner) {
const localHandler = handler.bind(instance);
owner = owner || serverNotifications;
- events.on(owner, name, localHandler);
+ Events.on(owner, name, localHandler);
instance['event_' + name] = localHandler;
}
@@ -278,7 +278,7 @@ import 'webcomponents';
const handler = instance['event_' + name];
if (handler) {
owner = owner || serverNotifications;
- events.off(owner, name, handler);
+ Events.off(owner, name, handler);
instance['event_' + name] = null;
}
}
diff --git a/src/elements/emby-playstatebutton/emby-playstatebutton.js b/src/elements/emby-playstatebutton/emby-playstatebutton.js
index 8d17ddf9ff..d177ed0df6 100644
--- a/src/elements/emby-playstatebutton/emby-playstatebutton.js
+++ b/src/elements/emby-playstatebutton/emby-playstatebutton.js
@@ -1,20 +1,21 @@
-import serverNotifications from 'serverNotifications';
-import events from 'events';
-import globalize from 'globalize';
-import EmbyButtonPrototype from 'emby-button';
+import serverNotifications from '../../scripts/serverNotifications';
+import { Events } from 'jellyfin-apiclient';
+import globalize from '../../scripts/globalize';
+import EmbyButtonPrototype from '../../elements/emby-button/emby-button';
+import ServerConnections from '../../components/ServerConnections';
/* eslint-disable indent */
function addNotificationEvent(instance, name, handler) {
const localHandler = handler.bind(instance);
- events.on(serverNotifications, name, localHandler);
+ Events.on(serverNotifications, name, localHandler);
instance[name] = localHandler;
}
function removeNotificationEvent(instance, name) {
const handler = instance[name];
if (handler) {
- events.off(serverNotifications, name, handler);
+ Events.off(serverNotifications, name, handler);
instance[name] = null;
}
}
@@ -23,7 +24,7 @@ import EmbyButtonPrototype from 'emby-button';
const button = this;
const id = button.getAttribute('data-id');
const serverId = button.getAttribute('data-serverid');
- const apiClient = window.connectionManager.getApiClient(serverId);
+ const apiClient = ServerConnections.getApiClient(serverId);
if (!button.classList.contains('playstatebutton-played')) {
apiClient.markPlayed(apiClient.getCurrentUserId(), id, new Date());
diff --git a/src/elements/emby-progressring/emby-progressring.js b/src/elements/emby-progressring/emby-progressring.js
index 63b9f73f10..af463ebe4e 100644
--- a/src/elements/emby-progressring/emby-progressring.js
+++ b/src/elements/emby-progressring/emby-progressring.js
@@ -1,5 +1,5 @@
-import 'css!./emby-progressring';
-import 'webcomponents';
+import './emby-progressring.css';
+import 'webcomponents.js/webcomponents-lite';
/* eslint-disable indent */
@@ -9,7 +9,7 @@ import 'webcomponents';
this.classList.add('progressring');
const instance = this;
- import('text!./emby-progressring.template.html').then(({default: template}) => {
+ import('./emby-progressring.template.html').then(({default: template}) => {
instance.innerHTML = template;
if (window.MutationObserver) {
diff --git a/src/elements/emby-radio/emby-radio.js b/src/elements/emby-radio/emby-radio.js
index 7c468a84a6..46cf4989d8 100644
--- a/src/elements/emby-radio/emby-radio.js
+++ b/src/elements/emby-radio/emby-radio.js
@@ -1,7 +1,7 @@
-import layoutManager from 'layoutManager';
-import 'css!./emby-radio';
-import 'webcomponents';
-import browser from 'browser';
+import layoutManager from '../../components/layoutManager';
+import browser from '../../scripts/browser';
+import 'webcomponents.js/webcomponents-lite';
+import './emby-radio.css';
/* eslint-disable indent */
diff --git a/src/elements/emby-ratingbutton/emby-ratingbutton.js b/src/elements/emby-ratingbutton/emby-ratingbutton.js
index 865d918b45..18ab1aa9a1 100644
--- a/src/elements/emby-ratingbutton/emby-ratingbutton.js
+++ b/src/elements/emby-ratingbutton/emby-ratingbutton.js
@@ -1,20 +1,21 @@
-import serverNotifications from 'serverNotifications';
-import events from 'events';
-import globalize from 'globalize';
-import EmbyButtonPrototype from 'emby-button';
+import serverNotifications from '../../scripts/serverNotifications';
+import { Events } from 'jellyfin-apiclient';
+import globalize from '../../scripts/globalize';
+import EmbyButtonPrototype from '../emby-button/emby-button';
+import ServerConnections from '../../components/ServerConnections';
/* eslint-disable indent */
function addNotificationEvent(instance, name, handler) {
const localHandler = handler.bind(instance);
- events.on(serverNotifications, name, localHandler);
+ Events.on(serverNotifications, name, localHandler);
instance[name] = localHandler;
}
function removeNotificationEvent(instance, name) {
const handler = instance[name];
if (handler) {
- events.off(serverNotifications, name, handler);
+ Events.off(serverNotifications, name, handler);
instance[name] = null;
}
}
@@ -27,7 +28,7 @@ import EmbyButtonPrototype from 'emby-button';
const button = this;
const id = button.getAttribute('data-id');
const serverId = button.getAttribute('data-serverid');
- const apiClient = window.connectionManager.getApiClient(serverId);
+ const apiClient = ServerConnections.getApiClient(serverId);
let likes = this.getAttribute('data-likes');
const isFavorite = this.getAttribute('data-isfavorite') === 'true';
diff --git a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
index f7665c0618..639cb627cd 100644
--- a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
+++ b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
@@ -1,6 +1,6 @@
-import 'css!./emby-scrollbuttons';
-import 'webcomponents';
-import 'paper-icon-button-light';
+import './emby-scrollbuttons.css';
+import 'webcomponents.js/webcomponents-lite';
+import '../emby-button/paper-icon-button-light';
/* eslint-disable indent */
diff --git a/src/elements/emby-scroller/emby-scroller.js b/src/elements/emby-scroller/emby-scroller.js
index d7133e317a..396f1284e8 100644
--- a/src/elements/emby-scroller/emby-scroller.js
+++ b/src/elements/emby-scroller/emby-scroller.js
@@ -1,11 +1,11 @@
-import scroller from 'scroller';
-import dom from 'dom';
-import layoutManager from 'layoutManager';
-import inputManager from 'inputManager';
-import focusManager from 'focusManager';
-import browser from 'browser';
-import 'webcomponents';
-import 'css!./emby-scroller';
+import scroller from '../../libraries/scroller';
+import dom from '../../scripts/dom';
+import layoutManager from '../../components/layoutManager';
+import inputManager from '../../scripts/inputManager';
+import focusManager from '../../components/focusManager';
+import browser from '../../scripts/browser';
+import 'webcomponents.js/webcomponents-lite';
+import './emby-scroller.css';
/* eslint-disable indent */
@@ -156,7 +156,7 @@ import 'css!./emby-scroller';
};
function loadScrollButtons(scroller) {
- import('emby-scrollbuttons').then(() => {
+ import('../emby-scrollbuttons/emby-scrollbuttons').then(() => {
scroller.insertAdjacentHTML('beforebegin', '
');
});
}
diff --git a/src/elements/emby-select/emby-select.js b/src/elements/emby-select/emby-select.js
index 0629a74e52..4d336a63a9 100644
--- a/src/elements/emby-select/emby-select.js
+++ b/src/elements/emby-select/emby-select.js
@@ -1,8 +1,8 @@
-import layoutManager from 'layoutManager';
-import browser from 'browser';
-import actionsheet from 'actionsheet';
-import 'css!./emby-select';
-import 'webcomponents';
+import layoutManager from '../../components/layoutManager';
+import browser from '../../scripts/browser';
+import actionsheet from '../../components/actionSheet/actionSheet';
+import './emby-select.css';
+import 'webcomponents.js/webcomponents-lite';
/* eslint-disable indent */
diff --git a/src/elements/emby-slider/emby-slider.css b/src/elements/emby-slider/emby-slider.css
index 01221b6cae..f7503d4fd5 100644
--- a/src/elements/emby-slider/emby-slider.css
+++ b/src/elements/emby-slider/emby-slider.css
@@ -157,7 +157,7 @@
}
.mdl-slider-background-flex {
- background: #333;
+ background: rgba(255, 255, 255, 0.3);
height: 0.2em;
margin-top: -0.1em;
width: 100%;
diff --git a/src/elements/emby-slider/emby-slider.js b/src/elements/emby-slider/emby-slider.js
index 555394af0d..828237a63d 100644
--- a/src/elements/emby-slider/emby-slider.js
+++ b/src/elements/emby-slider/emby-slider.js
@@ -1,10 +1,10 @@
-import browser from 'browser';
-import dom from 'dom';
-import layoutManager from 'layoutManager';
-import keyboardnavigation from 'keyboardnavigation';
-import 'css!./emby-slider';
-import 'webcomponents';
-import 'emby-input';
+import browser from '../../scripts/browser';
+import dom from '../../scripts/dom';
+import layoutManager from '../../components/layoutManager';
+import keyboardnavigation from '../../scripts/keyboardNavigation';
+import './emby-slider.css';
+import 'webcomponents.js/webcomponents-lite';
+import '../emby-input/emby-input';
/* eslint-disable indent */
@@ -442,7 +442,7 @@ import 'emby-input';
position = (position / runtime) * 100;
}
- for (const range in ranges) {
+ for (const range of ranges) {
if (position != null) {
if (position >= range.end) {
continue;
diff --git a/src/elements/emby-tabs/emby-tabs.js b/src/elements/emby-tabs/emby-tabs.js
index 7e16e31dd4..ebe46f9165 100644
--- a/src/elements/emby-tabs/emby-tabs.js
+++ b/src/elements/emby-tabs/emby-tabs.js
@@ -1,13 +1,12 @@
-import dom from 'dom';
-import scroller from 'scroller';
-import browser from 'browser';
-import focusManager from 'focusManager';
-import 'webcomponents';
-import 'css!./emby-tabs';
-import 'scrollStyles';
+import 'webcomponents.js/webcomponents-lite';
+import dom from '../../scripts/dom';
+import scroller from '../../libraries/scroller';
+import browser from '../../scripts/browser';
+import focusManager from '../../components/focusManager';
+import './emby-tabs.css';
+import '../../assets/css/scrollstyles.css';
/* eslint-disable indent */
-
const EmbyTabs = Object.create(HTMLDivElement.prototype);
const buttonClass = 'emby-tab-button';
const activeButtonClass = buttonClass + '-active';
diff --git a/src/elements/emby-textarea/emby-textarea.js b/src/elements/emby-textarea/emby-textarea.js
index c14724346a..18158d8703 100644
--- a/src/elements/emby-textarea/emby-textarea.js
+++ b/src/elements/emby-textarea/emby-textarea.js
@@ -1,6 +1,6 @@
-import 'css!./emby-textarea';
-import 'webcomponents';
-import 'emby-input';
+import './emby-textarea.css';
+import 'webcomponents.js/webcomponents-lite';
+import '../emby-input/emby-input';
/* eslint-disable indent */
diff --git a/src/elements/emby-toggle/emby-toggle.js b/src/elements/emby-toggle/emby-toggle.js
index 5e78b38dd3..7539ae398d 100644
--- a/src/elements/emby-toggle/emby-toggle.js
+++ b/src/elements/emby-toggle/emby-toggle.js
@@ -1,5 +1,5 @@
-import 'css!./emby-toggle';
-import 'webcomponents';
+import './emby-toggle.css';
+import 'webcomponents.js/webcomponents-lite';
/* eslint-disable indent */
diff --git a/src/libraries/navdrawer/navdrawer.js b/src/libraries/navdrawer/navdrawer.js
index 6dcf6783d1..214d86a02c 100644
--- a/src/libraries/navdrawer/navdrawer.js
+++ b/src/libraries/navdrawer/navdrawer.js
@@ -3,12 +3,12 @@
*/
/* eslint-disable no-var */
-import browser from 'browser';
-import dom from 'dom';
-import 'css!./navdrawer';
-import 'scrollStyles';
+import browser from '../../scripts/browser';
+import dom from '../../scripts/dom';
+import './navdrawer.css';
+import '../../assets/css/scrollstyles.css';
-export default function (options) {
+export function NavigationDrawer(options) {
function getTouches(e) {
return e.changedTouches || e.targetTouches || e.touches;
}
diff --git a/src/libraries/screensavermanager.css b/src/libraries/screensavermanager.css
new file mode 100644
index 0000000000..b11bbddb5e
--- /dev/null
+++ b/src/libraries/screensavermanager.css
@@ -0,0 +1,4 @@
+/* own "noScroll" class to avoid conflicts and the need for a scrollbar manager */
+.screensaver-noScroll {
+ overflow: hidden !important;
+}
diff --git a/src/libraries/screensavermanager.js b/src/libraries/screensavermanager.js
index 68a7dda73b..bdb049a23c 100644
--- a/src/libraries/screensavermanager.js
+++ b/src/libraries/screensavermanager.js
@@ -1,8 +1,10 @@
-import events from 'events';
-import playbackManager from 'playbackManager';
-import pluginManager from 'pluginManager';
-import inputManager from 'inputManager';
-import * as userSettings from 'userSettings';
+import { Events } from 'jellyfin-apiclient';
+import { playbackManager } from '../components/playback/playbackmanager';
+import { pluginManager } from '../components/pluginManager';
+import inputManager from '../scripts/inputManager';
+import * as userSettings from '../scripts/settings/userSettings';
+import ServerConnections from '../components/ServerConnections';
+import './screensavermanager.css';
function getMinIdleTime() {
// Returns the minimum amount of idle time required before the screen saver can be displayed
@@ -16,7 +18,7 @@ function getFunctionalEventIdleTime() {
return new Date().getTime() - lastFunctionalEvent;
}
-events.on(playbackManager, 'playbackstop', function (e, stopInfo) {
+Events.on(playbackManager, 'playbackstop', function (e, stopInfo) {
const state = stopInfo.state;
if (state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video') {
lastFunctionalEvent = new Date().getTime();
@@ -52,6 +54,8 @@ function ScreenSaverManager() {
console.debug('Showing screensaver ' + screensaver.name);
+ document.body.classList.add('screensaver-noScroll');
+
screensaver.show();
activeScreenSaver = screensaver;
@@ -69,7 +73,9 @@ function ScreenSaverManager() {
function hide() {
if (activeScreenSaver) {
console.debug('Hiding screensaver');
- activeScreenSaver.hide();
+ activeScreenSaver.hide().then(() => {
+ document.body.classList.remove('screensaver-noScroll');
+ });
activeScreenSaver = null;
}
@@ -84,7 +90,7 @@ function ScreenSaverManager() {
this.show = function () {
let isLoggedIn;
- const apiClient = window.connectionManager.currentApiClient();
+ const apiClient = ServerConnections.currentApiClient();
if (apiClient && apiClient.isLoggedIn()) {
isLoggedIn = true;
diff --git a/src/libraries/scroller.js b/src/libraries/scroller.js
index de6469c743..f2baf51572 100644
--- a/src/libraries/scroller.js
+++ b/src/libraries/scroller.js
@@ -2,12 +2,12 @@
* and will be replaced soon by a Vue component.
*/
-import browser from 'browser';
-import layoutManager from 'layoutManager';
-import dom from 'dom';
-import focusManager from 'focusManager';
-import ResizeObserver from 'ResizeObserver';
-import 'scrollStyles';
+import browser from '../scripts/browser';
+import layoutManager from '../components/layoutManager';
+import dom from '../scripts/dom';
+import focusManager from '../components/focusManager';
+import ResizeObserver from 'resize-observer-polyfill';
+import '../assets/css/scrollstyles.css';
/**
* Return type of the value.
diff --git a/src/plugins/backdropScreensaver/plugin.js b/src/plugins/backdropScreensaver/plugin.js
index 917d8f48a3..7db319a34e 100644
--- a/src/plugins/backdropScreensaver/plugin.js
+++ b/src/plugins/backdropScreensaver/plugin.js
@@ -1,4 +1,5 @@
/* eslint-disable indent */
+import ServerConnections from '../../components/ServerConnections';
class BackdropScreensaver {
constructor() {
@@ -20,10 +21,10 @@ class BackdropScreensaver {
Limit: 200
};
- const apiClient = window.connectionManager.currentApiClient();
+ const apiClient = ServerConnections.currentApiClient();
apiClient.getItems(apiClient.getCurrentUserId(), query).then((result) => {
if (result.Items.length) {
- import('slideshow').then(({default: Slideshow}) => {
+ import('../../components/slideshow/slideshow').then(({default: Slideshow}) => {
const newSlideShow = new Slideshow({
showTitle: true,
cover: true,
@@ -42,6 +43,7 @@ class BackdropScreensaver {
this.currentSlideshow.hide();
this.currentSlideshow = null;
}
+ return Promise.resolve();
}
}
/* eslint-enable indent */
diff --git a/src/plugins/bookPlayer/plugin.js b/src/plugins/bookPlayer/plugin.js
index c56777f378..7d7a8b89be 100644
--- a/src/plugins/bookPlayer/plugin.js
+++ b/src/plugins/bookPlayer/plugin.js
@@ -1,14 +1,14 @@
-import browser from 'browser';
-import loading from 'loading';
-import keyboardnavigation from 'keyboardnavigation';
-import dialogHelper from 'dialogHelper';
-import dom from 'dom';
-import events from 'events';
-import 'css!./style';
-import 'material-icons';
-import 'paper-icon-button-light';
-
+import loading from '../../components/loading/loading';
+import keyboardnavigation from '../../scripts/keyboardNavigation';
+import dialogHelper from '../../components/dialogHelper/dialogHelper';
+import '../../scripts/dom';
+import { Events } from 'jellyfin-apiclient';
+import './style.css';
+import 'material-design-icons-iconfont';
+import '../../elements/emby-button/paper-icon-button-light';
+import ServerConnections from '../../components/ServerConnections';
import TableOfContents from './tableOfContents';
+import browser from '../../scripts/browser';
export class BookPlayer {
constructor() {
@@ -260,7 +260,7 @@ export class BookPlayer {
};
const serverId = item.ServerId;
- const apiClient = window.connectionManager.getApiClient(serverId);
+ const apiClient = ServerConnections.getApiClient(serverId);
return new Promise((resolve, reject) => {
import('epubjs').then(({default: epubjs}) => {
@@ -290,7 +290,7 @@ export class BookPlayer {
epubElem.style.display = 'block';
rendition.on('relocated', (locations) => {
this.progress = book.locations.percentageFromCfi(locations.start.cfi);
- events.trigger(this, 'timeupdate');
+ Events.trigger(this, 'timeupdate');
});
loading.hide();
diff --git a/src/plugins/bookPlayer/tableOfContents.js b/src/plugins/bookPlayer/tableOfContents.js
index 165c1fa9ac..db498c10fd 100644
--- a/src/plugins/bookPlayer/tableOfContents.js
+++ b/src/plugins/bookPlayer/tableOfContents.js
@@ -1,4 +1,4 @@
-import dialogHelper from 'dialogHelper';
+import dialogHelper from '../../components/dialogHelper/dialogHelper';
export default class TableOfContents {
constructor(bookPlayer) {
diff --git a/src/plugins/chromecastPlayer/chromecastHelper.js b/src/plugins/chromecastPlayer/chromecastHelper.js
deleted file mode 100644
index e92fa4471b..0000000000
--- a/src/plugins/chromecastPlayer/chromecastHelper.js
+++ /dev/null
@@ -1,229 +0,0 @@
-import events from 'events';
-
-// LinkParser
-//
-// https://github.com/ravisorg/LinkParser
-//
-// Locate and extract almost any URL within a string. Handles protocol-less domains, IPv4 and
-// IPv6, unrecognised TLDs, and more.
-//
-// This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
-// http://creativecommons.org/licenses/by-sa/4.0/
-(function () {
- // Original URL regex from the Android android.text.util.Linkify function, found here:
- // http://stackoverflow.com/a/19696443
- //
- // However there were problems with it, most probably related to the fact it was
- // written in 2007, and it's been highly modified.
- //
- // 1) I didn't like the fact that it was tied to specific TLDs, since new ones
- // are being added all the time it wouldn't be reasonable to expect developer to
- // be continually updating their regular expressions.
- //
- // 2) It didn't allow unicode characters in the domains which are now allowed in
- // many languages, (including some IDN TLDs). Again these are constantly being
- // added to and it doesn't seem reasonable to hard-code them. Note this ended up
- // not being possible in standard JS due to the way it handles multibyte strings.
- // It is possible using XRegExp, however a big performance hit results. Disabled
- // for now.
- //
- // 3) It didn't allow for IPv6 hostnames
- // IPv6 regex from http://stackoverflow.com/a/17871737
- //
- // 4) It was very poorly commented
- //
- // 5) It wasn't as smart as it could have been about what should be part of a
- // URL and what should be part of human language.
-
- const protocols = '(?:(?:http|https|rtsp|ftp):\\/\\/)';
- const credentials = "(?:(?:[a-z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-f0-9]{2})){1,64}" // username (1-64 normal or url escaped characters)
- + "(?:\\:(?:[a-z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-f0-9]{2})){1,25})?" // followed by optional password (: + 1-25 normal or url escaped characters)
- + '\\@)';
-
- // IPv6 Regex http://forums.intermapper.com/viewtopic.php?t=452
- // by Dartware, LLC is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License
- // http://intermapper.com/
- const ipv6 = '('
- + '(([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))'
- + '|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))'
- + '|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))'
- + '|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))'
- + '|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))'
- + '|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))'
- + '|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))'
- + '|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))'
- + ')(%.+)?';
-
- const ipv4 = '(?:25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9])\\.'
- + '(?:25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9]|0)\\.'
- + '(?:25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9]|0)\\.'
- + '(?:25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[0-9])';
-
- // This would have been a lot cleaner if JS RegExp supported conditionals...
- const linkRegExpString =
-
- // begin match for protocol / username / password / host
- '(?:'
-
- // ============================
- // If we have a recognized protocol at the beginning of the URL, we're
- // more relaxed about what we accept, because we assume the user wants
- // this to be a URL, and we're not accidentally matching human language
- + protocols + '?'
-
- // optional username:password@
- + credentials + '?'
-
- // IP address (both v4 and v6)
- + '(?:'
-
- // IPv6
- + ipv6
-
- // IPv4
- + '|' + ipv4
-
- + ')'
-
- // end match for protocol / username / password / host
- + ')'
-
- // optional port number
- + '(?:\\:\\d{1,5})?'
-
- // plus optional path and query params (no unicode allowed here?)
- + '(?:'
- + '\\/(?:'
- // some characters we'll accept because it's unlikely human language
- // would use them after a URL unless they were part of the url
- + '(?:[a-z0-9\\/\\@\\&\\#\\~\\*\\_\\-\\+])'
- + '|(?:\\%[a-f0-9]{2})'
- // some characters are much more likely to be used AFTER a url and
- // were not intended to be included in the url itself. Mostly end
- // of sentence type things. It's also likely that the URL would
- // still work if any of these characters were missing from the end
- // because we parsed it incorrectly. For these characters to be accepted
- // they must be followed by another character that we're reasonably
- // sure is part of the url
- + "|(?:[\\;\\?\\:\\.\\!\\'\\(\\)\\,\\=]+(?=(?:[a-z0-9\\/\\@\\&\\#\\~\\*\\_\\-\\+])|(?:\\%[a-f0-9]{2})))"
- + ')*'
- + '|\\b|\$'
- + ')';
-
- // regex = XRegExp(regex,'gi');
- const linkRegExp = RegExp(linkRegExpString, 'gi');
-
- const protocolRegExp = RegExp('^' + protocols, 'i');
-
- // if url doesn't begin with a known protocol, add http by default
- function ensureProtocol(url) {
- if (!url.match(protocolRegExp)) {
- url = 'http://' + url;
- }
- return url;
- }
-
- // look for links in the text
- const LinkParser = {
- parse: function (text) {
- const links = [];
- let match;
-
- // eslint-disable-next-line no-cond-assign
- while (match = linkRegExp.exec(text)) {
- console.debug(match);
- const txt = match[0];
- const pos = match.index;
- const len = txt.length;
- const url = ensureProtocol(text);
- links.push({ 'pos': pos, 'text': txt, 'len': len, 'url': url });
- }
-
- return links;
- }
-
- };
-
- window.LinkParser = LinkParser;
-})();
-
-let cache = {};
-
-// TODO: Replace with isIP (https://www.npmjs.com/package/is-ip)
-function isValidIpAddress(address) {
- const links = LinkParser.parse(address);
-
- return links.length == 1;
-}
-
-// TODO: Add IPv6 support. Potentially replace with isLocalhost (https://www.npmjs.com/package/is-localhost-ip)
-function isLocalIpAddress(address) {
- address = address.toLowerCase();
-
- if (address.includes('127.0.0.1')) {
- return true;
- }
- if (address.includes('localhost')) {
- return true;
- }
-
- return false;
-}
-
-export function getServerAddress(apiClient) {
- const serverAddress = apiClient.serverAddress();
-
- if (isValidIpAddress(serverAddress) && !isLocalIpAddress(serverAddress)) {
- return Promise.resolve(serverAddress);
- }
-
- const cachedValue = getCachedValue(serverAddress);
- if (cachedValue) {
- return Promise.resolve(cachedValue);
- }
-
- return apiClient.getEndpointInfo().then(function (endpoint) {
- if (endpoint.IsInNetwork) {
- return apiClient.getPublicSystemInfo().then(function (info) {
- let localAddress = info.LocalAddress;
- if (!localAddress) {
- console.debug('No valid local address returned, defaulting to external one');
- localAddress = serverAddress;
- }
- addToCache(serverAddress, localAddress);
- return localAddress;
- });
- } else {
- addToCache(serverAddress, serverAddress);
- return serverAddress;
- }
- });
-}
-
-function clearCache() {
- cache = {};
-}
-
-function addToCache(key, value) {
- cache[key] = {
- value: value,
- time: new Date().getTime()
- };
-}
-
-function getCachedValue(key) {
- const obj = cache[key];
-
- if (obj && (new Date().getTime() - obj.time) < 180000) {
- return obj.value;
- }
-
- return null;
-}
-
-events.on(window.connectionManager, 'localusersignedin', clearCache);
-events.on(window.connectionManager, 'localusersignedout', clearCache);
-
-export default {
- getServerAddress: getServerAddress
-};
diff --git a/src/plugins/chromecastPlayer/plugin.js b/src/plugins/chromecastPlayer/plugin.js
index f61a0055af..41341066b3 100644
--- a/src/plugins/chromecastPlayer/plugin.js
+++ b/src/plugins/chromecastPlayer/plugin.js
@@ -1,9 +1,11 @@
-import appSettings from 'appSettings';
-import * as userSettings from 'userSettings';
-import playbackManager from 'playbackManager';
-import globalize from 'globalize';
-import events from 'events';
-import castSenderApiLoader from 'castSenderApiLoader';
+import appSettings from '../../scripts/settings/appSettings';
+import * as userSettings from '../../scripts/settings/userSettings';
+import { playbackManager } from '../../components/playback/playbackmanager';
+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
@@ -167,7 +169,7 @@ class CastPlayer {
alertText(globalize.translate('MessageChromecastConnectionError'), globalize.translate('HeaderError'));
}, 300);
} else if (message.type) {
- events.trigger(this, message.type, [message.data]);
+ Events.trigger(this, message.type, [message.data]);
}
}
@@ -236,7 +238,7 @@ class CastPlayer {
document.addEventListener('volumeupbutton', onVolumeUpKeyDown, false);
document.addEventListener('volumedownbutton', onVolumeDownKeyDown, false);
- events.trigger(this, 'connect');
+ Events.trigger(this, 'connect');
this.sendMessage({
options: {},
command: 'Identify'
@@ -324,11 +326,11 @@ class CastPlayer {
let apiClient;
if (message.options && message.options.ServerId) {
- apiClient = window.connectionManager.getApiClient(message.options.ServerId);
+ apiClient = ServerConnections.getApiClient(message.options.ServerId);
} else if (message.options && message.options.items && message.options.items.length) {
- apiClient = window.connectionManager.getApiClient(message.options.items[0].ServerId);
+ apiClient = ServerConnections.getApiClient(message.options.items[0].ServerId);
} else {
- apiClient = window.connectionManager.currentApiClient();
+ apiClient = ServerConnections.currentApiClient();
}
message = Object.assign(message, {
@@ -351,14 +353,7 @@ class CastPlayer {
message.subtitleBurnIn = appSettings.get('subtitleburnin') || '';
}
- return new Promise(function (resolve, reject) {
- import('./chromecastHelper').then(({ default: chromecastHelper }) => {
- chromecastHelper.getServerAddress(apiClient).then(function (serverAddress) {
- message.serverAddress = serverAddress;
- player.sendMessageInternal(message).then(resolve, reject);
- }, reject);
- });
- });
+ return player.sendMessageInternal(message);
}
sendMessageInternal(message) {
@@ -439,11 +434,9 @@ class CastPlayer {
}
function alertText(text, title) {
- import('alert').then(({default: alert}) => {
- alert({
- text: text,
- title: title
- });
+ alert({
+ text,
+ title
});
}
@@ -495,11 +488,11 @@ function getItemsForPlayback(apiClient, query) {
}
function bindEventForRelay(instance, eventName) {
- events.on(instance._castPlayer, eventName, function (e, data) {
+ Events.on(instance._castPlayer, eventName, function (e, data) {
console.debug('cc: ' + eventName);
const state = instance.getPlayerStateInternal(data);
- events.trigger(instance, eventName, [state]);
+ Events.trigger(instance, eventName, [state]);
});
}
@@ -514,7 +507,7 @@ function initializeChromecast() {
}
}));
- events.on(instance._castPlayer, 'connect', function (e) {
+ Events.on(instance._castPlayer, 'connect', function (e) {
if (currentResolve) {
sendConnectionResult(true);
} else {
@@ -526,20 +519,20 @@ function initializeChromecast() {
instance.lastPlayerData = null;
});
- events.on(instance._castPlayer, 'playbackstart', function (e, data) {
+ Events.on(instance._castPlayer, 'playbackstart', function (e, data) {
console.debug('cc: playbackstart');
instance._castPlayer.initializeCastPlayer();
const state = instance.getPlayerStateInternal(data);
- events.trigger(instance, 'playbackstart', [state]);
+ Events.trigger(instance, 'playbackstart', [state]);
});
- events.on(instance._castPlayer, 'playbackstop', function (e, data) {
+ Events.on(instance._castPlayer, 'playbackstop', function (e, data) {
console.debug('cc: playbackstop');
let state = instance.getPlayerStateInternal(data);
- events.trigger(instance, 'playbackstop', [state]);
+ Events.trigger(instance, 'playbackstop', [state]);
state = instance.lastPlayerData.PlayState || {};
const volume = state.VolumeLevel || 0.5;
@@ -552,11 +545,11 @@ function initializeChromecast() {
instance.lastPlayerData.PlayState.IsMuted = mute;
});
- events.on(instance._castPlayer, 'playbackprogress', function (e, data) {
+ Events.on(instance._castPlayer, 'playbackprogress', function (e, data) {
console.debug('cc: positionchange');
const state = instance.getPlayerStateInternal(data);
- events.trigger(instance, 'timeupdate', [state]);
+ Events.trigger(instance, 'timeupdate', [state]);
});
bindEventForRelay(instance, 'timeupdate');
@@ -566,11 +559,11 @@ function initializeChromecast() {
bindEventForRelay(instance, 'repeatmodechange');
bindEventForRelay(instance, 'shufflequeuemodechange');
- events.on(instance._castPlayer, 'playstatechange', function (e, data) {
+ Events.on(instance._castPlayer, 'playstatechange', function (e, data) {
console.debug('cc: playstatechange');
const state = instance.getPlayerStateInternal(data);
- events.trigger(instance, 'pause', [state]);
+ Events.trigger(instance, 'pause', [state]);
});
}
@@ -664,7 +657,7 @@ class ChromecastPlayer {
console.debug(JSON.stringify(data));
if (triggerStateChange) {
- events.trigger(this, 'statechange', [data]);
+ Events.trigger(this, 'statechange', [data]);
}
return data;
@@ -672,7 +665,7 @@ class ChromecastPlayer {
playWithCommand(options, command) {
if (!options.items) {
- const apiClient = window.connectionManager.getApiClient(options.serverId);
+ const apiClient = ServerConnections.getApiClient(options.serverId);
const instance = this;
return apiClient.getItem(apiClient.getCurrentUserId(), options.ids[0]).then(function (item) {
@@ -984,7 +977,7 @@ class ChromecastPlayer {
}
shuffle(item) {
- const apiClient = window.connectionManager.getApiClient(item.ServerId);
+ const apiClient = ServerConnections.getApiClient(item.ServerId);
const userId = apiClient.getCurrentUserId();
const instance = this;
@@ -997,7 +990,7 @@ class ChromecastPlayer {
}
instantMix(item) {
- const apiClient = window.connectionManager.getApiClient(item.ServerId);
+ const apiClient = ServerConnections.getApiClient(item.ServerId);
const userId = apiClient.getCurrentUserId();
const instance = this;
@@ -1035,7 +1028,7 @@ class ChromecastPlayer {
}
const instance = this;
- const apiClient = window.connectionManager.getApiClient(options.serverId);
+ const apiClient = ServerConnections.getApiClient(options.serverId);
return getItemsForPlayback(apiClient, {
Ids: options.ids.join(',')
diff --git a/src/plugins/comicsPlayer/plugin.js b/src/plugins/comicsPlayer/plugin.js
index 8cdf3db5e6..89e110cec3 100644
--- a/src/plugins/comicsPlayer/plugin.js
+++ b/src/plugins/comicsPlayer/plugin.js
@@ -1,8 +1,10 @@
-import loading from 'loading';
-import dialogHelper from 'dialogHelper';
-import keyboardnavigation from 'keyboardnavigation';
-import appRouter from 'appRouter';
-import * as libarchive from 'libarchive';
+// eslint-disable-next-line import/named, import/namespace
+import { Archive } from 'libarchive.js';
+import loading from '../../components/loading/loading';
+import dialogHelper from '../../components/dialogHelper/dialogHelper';
+import keyboardnavigation from '../../scripts/keyboardNavigation';
+import { appRouter } from '../../components/appRouter';
+import ServerConnections from '../../components/ServerConnections';
export class ComicsPlayer {
constructor() {
@@ -93,9 +95,9 @@ export class ComicsPlayer {
loading.show();
const serverId = item.ServerId;
- const apiClient = window.connectionManager.getApiClient(serverId);
+ const apiClient = ServerConnections.getApiClient(serverId);
- libarchive.Archive.init({
+ Archive.init({
workerUrl: appRouter.baseUrl() + '/libraries/worker-bundle.js'
});
@@ -175,7 +177,7 @@ class ArchiveSource {
}
const blob = await res.blob();
- this.archive = await libarchive.Archive.open(blob);
+ this.archive = await Archive.open(blob);
this.raw = await this.archive.getFilesArray();
this.numberOfFiles = this.raw.length;
await this.archive.extractFiles();
diff --git a/src/plugins/experimentalWarnings/plugin.js b/src/plugins/experimentalWarnings/plugin.js
index bc301f01af..cae6e8b67c 100644
--- a/src/plugins/experimentalWarnings/plugin.js
+++ b/src/plugins/experimentalWarnings/plugin.js
@@ -1,6 +1,7 @@
-import globalize from 'globalize';
-import * as userSettings from 'userSettings';
-import appHost from 'apphost';
+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);
-
- import('alert').then(({default: alert}) => {
- return alert(text).then(resolve, resolve);
- });
- });
+ userSettings.set(userSettingsKey, '1', false);
+ return alert(text).catch(() => { /* ignore exceptions */ });
}
function showBlurayMessage() {
diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js
index 6f413fac50..975e6f8a62 100644
--- a/src/plugins/htmlAudioPlayer/plugin.js
+++ b/src/plugins/htmlAudioPlayer/plugin.js
@@ -1,12 +1,11 @@
-import events from 'events';
-import browser from 'browser';
-import appHost from 'apphost';
-import * as htmlMediaHelper from 'htmlMediaHelper';
+import { Events } from 'jellyfin-apiclient';
+import browser from '../../scripts/browser';
+import { appHost } from '../../components/apphost';
+import * as htmlMediaHelper from '../../components/htmlMediaHelper';
+import profileBuilder from '../../scripts/browserDeviceProfile';
function getDefaultProfile() {
- return import('browserdeviceprofile').then(({ default: profileBuilder }) => {
- return profileBuilder({});
- });
+ return profileBuilder({});
}
let fadeTimeout;
@@ -51,7 +50,7 @@ function supportsFade() {
}
function requireHlsPlayer(callback) {
- import('hlsjs').then(({ default: hls }) => {
+ import('hls.js').then(({ default: hls }) => {
window.Hls = hls;
callback();
});
@@ -68,7 +67,7 @@ function enableHlsPlayer(url, item, mediaSource, mediaType) {
// issue head request to get content type
return new Promise(function (resolve, reject) {
- import('fetchHelper').then((fetchHelper) => {
+ import('../../components/fetchhelper').then((fetchHelper) => {
fetchHelper.ajax({
url: url,
type: 'HEAD'
@@ -251,14 +250,14 @@ class HtmlAudioPlayer {
// Don't trigger events after user stop
if (!self._isFadingOut) {
self._currentTime = time;
- events.trigger(self, 'timeupdate');
+ Events.trigger(self, 'timeupdate');
}
}
function onVolumeChange() {
if (!self._isFadingOut) {
htmlMediaHelper.saveVolume(this.volume);
- events.trigger(self, 'volumechange');
+ Events.trigger(self, 'volumechange');
}
}
@@ -269,19 +268,19 @@ class HtmlAudioPlayer {
htmlMediaHelper.seekOnPlaybackStart(self, e.target, self._currentPlayOptions.playerStartPositionTicks);
}
- events.trigger(self, 'playing');
+ Events.trigger(self, 'playing');
}
function onPlay(e) {
- events.trigger(self, 'unpause');
+ Events.trigger(self, 'unpause');
}
function onPause() {
- events.trigger(self, 'pause');
+ Events.trigger(self, 'pause');
}
function onWaiting() {
- events.trigger(self, 'waiting');
+ Events.trigger(self, 'waiting');
}
function onError() {
diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js
index 32f96c8e2e..1b1ec39d18 100644
--- a/src/plugins/htmlVideoPlayer/plugin.js
+++ b/src/plugins/htmlVideoPlayer/plugin.js
@@ -1,10 +1,10 @@
-import browser from 'browser';
-import events from 'events';
-import appHost from 'apphost';
-import loading from 'loading';
-import dom from 'dom';
-import playbackManager from 'playbackManager';
-import appRouter from 'appRouter';
+import browser from '../../scripts/browser';
+import { Events } from 'jellyfin-apiclient';
+import { appHost } from '../../components/apphost';
+import loading from '../../components/loading/loading';
+import dom from '../../scripts/dom';
+import { playbackManager } from '../../components/playback/playbackmanager';
+import { appRouter } from '../../components/appRouter';
import {
bindEventsToHlsPlayer,
destroyHlsPlayer,
@@ -22,10 +22,12 @@ import {
getSavedVolume,
isValidDuration,
getBufferedRanges
-} from 'htmlMediaHelper';
-import itemHelper from 'itemHelper';
-import screenfull from 'screenfull';
-import globalize from 'globalize';
+} from '../../components/htmlMediaHelper';
+import itemHelper from '../../components/itemHelper';
+import Screenfull from 'screenfull';
+import globalize from '../../scripts/globalize';
+import ServerConnections from '../../components/ServerConnections';
+import profileBuilder from '../../scripts/browserDeviceProfile';
/* eslint-disable indent */
@@ -85,7 +87,7 @@ function tryRemoveElement(elem) {
}
function requireHlsPlayer(callback) {
- import('hlsjs').then(({default: hls}) => {
+ import('hls.js').then(({default: hls}) => {
window.Hls = hls;
callback();
});
@@ -103,13 +105,6 @@ function tryRemoveElement(elem) {
});
}
- function hidePrePlaybackPage() {
- const animatedPage = document.querySelector('.page:not(.hide)');
- animatedPage.classList.add('hide');
- // At this point, we must hide the scrollbar placeholder, so it's not being displayed while the item is being loaded
- document.body.classList.remove('force-scroll');
- }
-
function zoomIn(elem) {
return new Promise(resolve => {
const duration = 240;
@@ -139,9 +134,7 @@ function tryRemoveElement(elem) {
}
function getDefaultProfile() {
- return import('browserdeviceprofile').then(({default: profileBuilder}) => {
- return profileBuilder({});
- });
+ return profileBuilder({});
}
export class HtmlVideoPlayer {
@@ -286,7 +279,7 @@ function tryRemoveElement(elem) {
incrementFetchQueue() {
if (this.#fetchQueue <= 0) {
this.isFetching = true;
- events.trigger(this, 'beginFetch');
+ Events.trigger(this, 'beginFetch');
}
this.#fetchQueue++;
@@ -300,7 +293,7 @@ function tryRemoveElement(elem) {
if (this.#fetchQueue <= 0) {
this.isFetching = false;
- events.trigger(this, 'endFetch');
+ Events.trigger(this, 'endFetch');
}
}
@@ -323,7 +316,7 @@ function tryRemoveElement(elem) {
console.debug(`prefetching hls playlist: ${hlsPlaylistUrl}`);
- return window.connectionManager.getApiClient(item.ServerId).ajax({
+ return ServerConnections.getApiClient(item.ServerId).ajax({
type: 'GET',
url: hlsPlaylistUrl
@@ -362,7 +355,7 @@ function tryRemoveElement(elem) {
* @private
*/
setSrcWithFlvJs(elem, options, url) {
- return import('flvjs').then(({default: flvjs}) => {
+ return import('flv.js').then(({default: flvjs}) => {
const flvPlayer = flvjs.createPlayer({
type: 'flv',
url: url
@@ -678,6 +671,7 @@ function tryRemoveElement(elem) {
destroyFlvPlayer(this);
appRouter.setTransparency('none');
+ document.body.classList.remove('hide-scroll');
const videoElement = this.#mediaElement;
@@ -704,8 +698,8 @@ function tryRemoveElement(elem) {
dlg.parentNode.removeChild(dlg);
}
- if (screenfull.isEnabled) {
- screenfull.exit();
+ if (Screenfull.isEnabled) {
+ Screenfull.exit();
} else {
// iOS Safari
if (document.webkitIsFullScreen && document.webkitCancelFullscreen) {
@@ -754,7 +748,7 @@ function tryRemoveElement(elem) {
this.updateSubtitleText(timeMs);
}
- events.trigger(this, 'timeupdate');
+ Events.trigger(this, 'timeupdate');
};
/**
@@ -767,7 +761,7 @@ function tryRemoveElement(elem) {
*/
const elem = e.target;
saveVolume(elem.volume);
- events.trigger(this, 'volumechange');
+ Events.trigger(this, 'volumechange');
};
/**
@@ -826,14 +820,14 @@ function tryRemoveElement(elem) {
this.onStartedAndNavigatedToOsd();
}
}
- events.trigger(this, 'playing');
+ Events.trigger(this, 'playing');
};
/**
* @private
*/
onPlay = () => {
- events.trigger(this, 'unpause');
+ Events.trigger(this, 'unpause');
};
/**
@@ -859,25 +853,25 @@ function tryRemoveElement(elem) {
* @private
*/
onClick = () => {
- events.trigger(this, 'click');
+ Events.trigger(this, 'click');
};
/**
* @private
*/
onDblClick = () => {
- events.trigger(this, 'dblclick');
+ Events.trigger(this, 'dblclick');
};
/**
* @private
*/
onPause = () => {
- events.trigger(this, 'pause');
+ Events.trigger(this, 'pause');
};
onWaiting() {
- events.trigger(this, 'waiting');
+ Events.trigger(this, 'waiting');
}
/**
@@ -1030,15 +1024,21 @@ function tryRemoveElement(elem) {
* @private
*/
renderSsaAss(videoElement, track, item) {
+ const avaliableFonts = [];
const attachments = this._currentPlayOptions.mediaSource.MediaAttachments || [];
- const apiClient = window.connectionManager.getApiClient(item);
+ attachments.map(function (i) {
+ // embedded font url
+ return avaliableFonts.push(i.DeliveryUrl);
+ });
+ const apiClient = ServerConnections.getApiClient(item);
+ const fallbackFontList = apiClient.getUrl('/FallbackFont/Fonts', {
+ api_key: apiClient.accessToken()
+ });
const htmlVideoPlayer = this;
const options = {
video: videoElement,
subUrl: getTextTrackUrl(track, item),
- fonts: attachments.map(function (i) {
- return apiClient.getUrl(i.DeliveryUrl);
- }),
+ fonts: avaliableFonts,
workerUrl: `${appRouter.baseUrl()}/libraries/subtitles-octopus-worker.js`,
legacyWorkerUrl: `${appRouter.baseUrl()}/libraries/subtitles-octopus-worker-legacy.js`,
onError() {
@@ -1058,8 +1058,22 @@ function tryRemoveElement(elem) {
resizeVariation: 0.2,
renderAhead: 90
};
- import('JavascriptSubtitlesOctopus').then(({default: SubtitlesOctopus}) => {
- this.#currentSubtitlesOctopus = new SubtitlesOctopus(options);
+ import('libass-wasm').then(({default: SubtitlesOctopus}) => {
+ apiClient.getNamedConfiguration('encoding').then(config => {
+ if (config.EnableFallbackFont) {
+ apiClient.getJSON(fallbackFontList).then((fontFiles = []) => {
+ fontFiles.forEach(font => {
+ const fontUrl = apiClient.getUrl(`/FallbackFont/Fonts/${font.Name}`, {
+ api_key: apiClient.accessToken()
+ });
+ avaliableFonts.push(fontUrl);
+ });
+ this.#currentSubtitlesOctopus = new SubtitlesOctopus(options);
+ });
+ } else {
+ this.#currentSubtitlesOctopus = new SubtitlesOctopus(options);
+ }
+ });
});
}
@@ -1114,7 +1128,7 @@ function tryRemoveElement(elem) {
* @private
*/
setSubtitleAppearance(elem, innerElem) {
- Promise.all([import('userSettings'), import('subtitleAppearanceHelper')]).then(([userSettings, subtitleAppearanceHelper]) => {
+ Promise.all([import('../../scripts/settings/userSettings'), import('../../components/subtitlesettings/subtitleappearancehelper')]).then(([userSettings, subtitleAppearanceHelper]) => {
subtitleAppearanceHelper.applyStyles({
text: innerElem,
window: elem
@@ -1135,7 +1149,7 @@ function tryRemoveElement(elem) {
* @private
*/
setCueAppearance() {
- Promise.all([import('userSettings'), import('subtitleAppearanceHelper')]).then(([userSettings, subtitleAppearanceHelper]) => {
+ Promise.all([import('../../scripts/settings/userSettings'), import('../../components/subtitlesettings/subtitleappearancehelper')]).then(([userSettings, subtitleAppearanceHelper]) => {
const elementId = `${this.id}-cuestyle`;
let styleElem = document.querySelector(`#${elementId}`);
@@ -1190,7 +1204,7 @@ function tryRemoveElement(elem) {
// download the track json
this.fetchSubtitles(track, item).then(function (data) {
- import('userSettings').then((userSettings) => {
+ import('../../scripts/settings/userSettings').then((userSettings) => {
// show in ui
console.debug(`downloaded ${data.TrackEvents.length} track events`);
@@ -1282,7 +1296,7 @@ function tryRemoveElement(elem) {
const dlg = document.querySelector('.videoPlayerContainer');
if (!dlg) {
- return import('css!./style').then(() => {
+ return import('./style.css').then(() => {
loading.show();
const dlg = document.createElement('div');
@@ -1328,7 +1342,8 @@ function tryRemoveElement(elem) {
this.#mediaElement = videoElement;
if (options.fullscreen) {
- hidePrePlaybackPage();
+ // At this point, we must hide the scrollbar placeholder, so it's not being displayed while the item is being loaded
+ document.body.classList.add('hide-scroll');
}
// don't animate on smart tv's, too slow
@@ -1341,8 +1356,9 @@ function tryRemoveElement(elem) {
}
});
} else {
+ // we need to hide scrollbar when starting playback from page with animated background
if (options.fullscreen) {
- hidePrePlaybackPage();
+ document.body.classList.add('hide-scroll');
}
return Promise.resolve(dlg.querySelector('video'));
@@ -1519,7 +1535,7 @@ function tryRemoveElement(elem) {
return false;
}
- static isAirPlayEnabled() {
+ isAirPlayEnabled() {
if (document.AirPlayEnabled) {
return !!document.AirplayElement;
}
@@ -1561,7 +1577,7 @@ function tryRemoveElement(elem) {
elem.style['-webkit-filter'] = `brightness(${cssValue})`;
elem.style.filter = `brightness(${cssValue})`;
elem.brightnessValue = val;
- events.trigger(this, 'brightnesschange');
+ Events.trigger(this, 'brightnesschange');
}
}
@@ -1721,13 +1737,13 @@ function tryRemoveElement(elem) {
getSupportedAspectRatios() {
return [{
- name: 'Auto',
+ name: globalize.translate('Auto'),
id: 'auto'
}, {
- name: 'Cover',
+ name: globalize.translate('AspectRatioCover'),
id: 'cover'
}, {
- name: 'Fill',
+ name: globalize.translate('AspectRatioFill'),
id: 'fill'
}];
}
diff --git a/src/plugins/logoScreensaver/plugin.js b/src/plugins/logoScreensaver/plugin.js
index 61b8f8a6d6..5067546c7f 100644
--- a/src/plugins/logoScreensaver/plugin.js
+++ b/src/plugins/logoScreensaver/plugin.js
@@ -1,5 +1,3 @@
-import pluginManager from 'pluginManager';
-
export default function () {
const self = this;
@@ -128,7 +126,7 @@ export default function () {
}
self.show = function () {
- import('css!' + pluginManager.mapPath(self, 'style.css')).then(() => {
+ import('./style.css').then(() => {
let elem = document.querySelector('.logoScreenSaver');
if (!elem) {
@@ -150,16 +148,21 @@ export default function () {
const elem = document.querySelector('.logoScreenSaver');
if (elem) {
- const onAnimationFinish = function () {
- elem.parentNode.removeChild(elem);
- };
+ return new Promise((resolve) => {
+ const onAnimationFinish = function () {
+ elem.parentNode.removeChild(elem);
+ resolve();
+ };
- if (elem.animate) {
- const animation = fadeOut(elem, 1);
- animation.onfinish = onAnimationFinish;
- } else {
- onAnimationFinish();
- }
+ if (elem.animate) {
+ const animation = fadeOut(elem, 1);
+ animation.onfinish = onAnimationFinish;
+ } else {
+ onAnimationFinish();
+ }
+ });
}
+
+ return Promise.resolve();
};
}
diff --git a/src/plugins/pdfPlayer/plugin.js b/src/plugins/pdfPlayer/plugin.js
index 480eb80546..5bface5911 100644
--- a/src/plugins/pdfPlayer/plugin.js
+++ b/src/plugins/pdfPlayer/plugin.js
@@ -1,12 +1,13 @@
-import loading from 'loading';
-import keyboardnavigation from 'keyboardnavigation';
-import dialogHelper from 'dialogHelper';
-import dom from 'dom';
-import appRouter from 'appRouter';
-import events from 'events';
-import 'css!./style';
-import 'material-icons';
-import 'paper-icon-button-light';
+import ServerConnections from '../../components/ServerConnections';
+import loading from '../../components/loading/loading';
+import keyboardnavigation from '../../scripts/keyboardNavigation';
+import dialogHelper from '../../components/dialogHelper/dialogHelper';
+import dom from '../../scripts/dom';
+import { appRouter } from '../../components/appRouter';
+import './style.css';
+import '../../elements/emby-button/paper-icon-button-light';
+import { Events } from 'jellyfin-apiclient';
+import { GlobalWorkerOptions, getDocument } from 'pdfjs-dist';
export class PdfPlayer {
constructor() {
@@ -186,31 +187,29 @@ export class PdfPlayer {
};
const serverId = item.ServerId;
- const apiClient = window.connectionManager.getApiClient(serverId);
+ const apiClient = ServerConnections.getApiClient(serverId);
return new Promise((resolve, reject) => {
- import('pdfjs').then(({default: pdfjs}) => {
- const downloadHref = apiClient.getItemDownloadUrl(item.Id);
+ const downloadHref = apiClient.getItemDownloadUrl(item.Id);
- this.bindEvents();
- pdfjs.GlobalWorkerOptions.workerSrc = appRouter.baseUrl() + '/libraries/pdf.worker.js';
+ this.bindEvents();
+ GlobalWorkerOptions.workerSrc = appRouter.baseUrl() + '/libraries/pdf.worker.js';
- const downloadTask = pdfjs.getDocument(downloadHref);
- downloadTask.promise.then(book => {
- if (this.cancellationToken) return;
- this.book = book;
- this.loaded = true;
+ const downloadTask = getDocument(downloadHref);
+ downloadTask.promise.then(book => {
+ if (this.cancellationToken) return;
+ this.book = book;
+ this.loaded = true;
- const percentageTicks = options.startPositionTicks / 10000;
- if (percentageTicks !== 0) {
- this.loadPage(percentageTicks);
- this.progress = percentageTicks;
- } else {
- this.loadPage(1);
- }
+ const percentageTicks = options.startPositionTicks / 10000;
+ if (percentageTicks !== 0) {
+ this.loadPage(percentageTicks);
+ this.progress = percentageTicks;
+ } else {
+ this.loadPage(1);
+ }
- return resolve();
- });
+ return resolve();
});
});
}
@@ -266,7 +265,7 @@ export class PdfPlayer {
renderPage(canvas, number) {
this.book.getPage(number).then(page => {
- events.trigger(this, 'timeupdate');
+ Events.trigger(this, 'timeupdate');
const original = page.getViewport({ scale: 1 });
const context = canvas.getContext('2d');
diff --git a/src/plugins/photoPlayer/plugin.js b/src/plugins/photoPlayer/plugin.js
index c40477778e..2324ef8932 100644
--- a/src/plugins/photoPlayer/plugin.js
+++ b/src/plugins/photoPlayer/plugin.js
@@ -1,3 +1,4 @@
+import ServerConnections from '../../components/ServerConnections';
export default class PhotoPlayer {
constructor() {
@@ -9,12 +10,12 @@ export default class PhotoPlayer {
play(options) {
return new Promise(function (resolve, reject) {
- import('slideshow').then(({default: slideshow}) => {
+ import('../../components/slideshow/slideshow').then(({default: Slideshow}) => {
const index = options.startIndex || 0;
- const apiClient = window.connectionManager.currentApiClient();
+ const apiClient = ServerConnections.currentApiClient();
apiClient.getCurrentUser().then(function(result) {
- const newSlideShow = new slideshow({
+ const newSlideShow = new Slideshow({
showTitle: false,
cover: false,
items: options.items,
diff --git a/src/plugins/playAccessValidation/plugin.js b/src/plugins/playAccessValidation/plugin.js
index c64b63332b..6ed64342a6 100644
--- a/src/plugins/playAccessValidation/plugin.js
+++ b/src/plugins/playAccessValidation/plugin.js
@@ -1,9 +1,9 @@
-import globalize from 'globalize';
+import globalize from '../../scripts/globalize';
+import ServerConnections from '../../components/ServerConnections';
+import alert from '../../components/alert';
function showErrorMessage() {
- return import('alert').then(({default: alert}) => {
- return alert(globalize.translate('MessagePlayAccessRestricted'));
- });
+ return alert(globalize.translate('MessagePlayAccessRestricted'));
}
class PlayAccessValidation {
@@ -24,7 +24,7 @@ class PlayAccessValidation {
return Promise.resolve();
}
- return window.connectionManager.getApiClient(serverId).getCurrentUser().then(function (user) {
+ return ServerConnections.getApiClient(serverId).getCurrentUser().then(function (user) {
if (user.Policy.EnableMediaPlayback) {
return Promise.resolve();
}
diff --git a/src/plugins/sessionPlayer/plugin.js b/src/plugins/sessionPlayer/plugin.js
index 619266b01f..b68154b19c 100644
--- a/src/plugins/sessionPlayer/plugin.js
+++ b/src/plugins/sessionPlayer/plugin.js
@@ -1,6 +1,7 @@
-import playbackManager from 'playbackManager';
-import events from 'events';
-import serverNotifications from 'serverNotifications';
+import { playbackManager } from '../../components/playback/playbackmanager';
+import { Events } from 'jellyfin-apiclient';
+import serverNotifications from '../../scripts/serverNotifications';
+import ServerConnections from '../../components/ServerConnections';
function getActivePlayerId() {
const info = playbackManager.getPlayerInfo();
@@ -53,10 +54,10 @@ function getCurrentApiClient(instance) {
const currentServerId = instance.currentServerId;
if (currentServerId) {
- return window.connectionManager.getApiClient(currentServerId);
+ return ServerConnections.getApiClient(currentServerId);
}
- return window.connectionManager.currentApiClient();
+ return ServerConnections.currentApiClient();
}
function sendCommandByName(instance, name, options) {
@@ -104,7 +105,7 @@ function processUpdatedSessions(instance, sessions, apiClient) {
instance.lastPlayerData = session;
for (let i = 0, length = eventNames.length; i < length; i++) {
- events.trigger(instance, eventNames[i], [session]);
+ Events.trigger(instance, eventNames[i], [session]);
}
} else {
instance.lastPlayerData = session;
@@ -186,7 +187,7 @@ class SessionPlayer {
this.isLocalPlayer = false;
this.id = 'remoteplayer';
- events.on(serverNotifications, 'Sessions', function (e, apiClient, data) {
+ Events.on(serverNotifications, 'Sessions', function (e, apiClient, data) {
processUpdatedSessions(self, data, apiClient);
});
}
diff --git a/src/plugins/youtubePlayer/plugin.js b/src/plugins/youtubePlayer/plugin.js
index eed75a8116..6362cb3cbb 100644
--- a/src/plugins/youtubePlayer/plugin.js
+++ b/src/plugins/youtubePlayer/plugin.js
@@ -1,10 +1,18 @@
-import events from 'events';
-import browser from 'browser';
-import appRouter from 'appRouter';
-import loading from 'loading';
+import { Events } from 'jellyfin-apiclient';
+import browser from '../../scripts/browser';
+import { appRouter } from '../../components/appRouter';
+import loading from '../../components/loading/loading';
/* globals YT */
+const errorCodes = {
+ 2: 'YoutubeBadRequest',
+ 5: 'YoutubePlaybackError',
+ 100: 'YoutubeNotFound',
+ 101: 'YoutubeDenied',
+ 150: 'YoutubeDenied'
+};
+
function zoomIn(elem, iterations) {
const keyframes = [
{ transform: 'scale3d(.2, .2, .2) ', opacity: '.6', offset: 0 },
@@ -20,7 +28,7 @@ function createMediaElement(instance, options) {
const dlg = document.querySelector('.youtubePlayerContainer');
if (!dlg) {
- import('css!./style').then(() => {
+ import('./style.css').then(() => {
loading.show();
const dlg = document.createElement('div');
@@ -37,6 +45,10 @@ function createMediaElement(instance, options) {
document.body.insertBefore(dlg, document.body.firstChild);
instance.videoDialog = dlg;
+ if (options.fullscreen) {
+ document.body.classList.add('hide-scroll');
+ }
+
if (options.fullscreen && dlg.animate && !browser.slow) {
zoomIn(dlg, 1).onfinish = function () {
resolve(videoElement);
@@ -46,6 +58,11 @@ function createMediaElement(instance, options) {
}
});
} else {
+ // we need to hide scrollbar when starting playback from page with animated background
+ if (options.fullscreen) {
+ document.body.classList.add('hide-scroll');
+ }
+
resolve(dlg.querySelector('#player'));
}
});
@@ -80,7 +97,7 @@ function onEndedInternal(instance) {
src: instance._currentSrc
};
- events.trigger(instance, 'stopped', [stopInfo]);
+ Events.trigger(instance, 'stopped', [stopInfo]);
instance._currentSrc = null;
if (instance.currentYoutubePlayer) {
@@ -95,7 +112,7 @@ function onPlayerReady(event) {
}
function onTimeUpdate(e) {
- events.trigger(this, 'timeupdate');
+ Events.trigger(this, 'timeupdate');
}
function onPlaying(instance, playOptions, resolve) {
@@ -114,68 +131,65 @@ function onPlaying(instance, playOptions, resolve) {
instance.videoDialog.classList.remove('onTop');
}
- import('loading').then(({default: loading}) => {
- loading.hide();
- });
+ loading.hide();
}
}
function setCurrentSrc(instance, elem, options) {
return new Promise(function (resolve, reject) {
- import('queryString').then(({default: queryString}) => {
- instance._currentSrc = options.url;
- const params = queryString.parse(options.url.split('?')[1]);
- // 3. This function creates an