Merge pull request #5913 from thornbill/index-refactor

Refactor app startup code

src/controllers/dashboard/apikeys.js

@@ -3,7 +3,7 @@ import escapeHTML from 'escape-html';
 import datetime from '../../scripts/datetime';
 import loading from '../../components/loading/loading';
 import dom from '../../scripts/dom';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import '../../elements/emby-button/emby-button';
 import confirm from '../../components/confirm/confirm';
 import { pageIdOn } from '../../utils/dashboard';

src/controllers/dashboard/dashboard.js

@@ -5,7 +5,7 @@ import Events from '../../utils/events.ts';
 import itemHelper from '../../components/itemHelper';
 import serverNotifications from '../../scripts/serverNotifications';
 import dom from '../../scripts/dom';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import { formatDistanceToNow } from 'date-fns';
 import { getLocaleWithSuffix } from '../../utils/dateFnsLocale.ts';
 import loading from '../../components/loading/loading';

src/controllers/dashboard/devices/devices.js

@@ -1,7 +1,7 @@
 import escapeHtml from 'escape-html';
 import loading from '../../../components/loading/loading';
 import dom from '../../../scripts/dom';
-import globalize from '../../../scripts/globalize';
+import globalize from '../../../lib/globalize';
 import imageHelper from '../../../utils/image';
 import { formatDistanceToNow } from 'date-fns';
 import { getLocaleWithSuffix } from '../../../utils/dateFnsLocale.ts';

src/controllers/dashboard/encodingsettings.js

@@ -1,6 +1,6 @@
 import 'jquery';
 import loading from '../../components/loading/loading';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import dom from '../../scripts/dom';
 import Dashboard from '../../utils/dashboard';
 import alert from '../../components/alert';

src/controllers/dashboard/general.js

@@ -1,7 +1,7 @@
 import 'jquery';
 
 import loading from '../../components/loading/loading';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-textarea/emby-textarea';
 import '../../elements/emby-input/emby-input';

src/controllers/dashboard/library.js

@@ -2,7 +2,7 @@ import escapeHtml from 'escape-html';
 import 'jquery';
 import taskButton from '../../scripts/taskbutton';
 import loading from '../../components/loading/loading';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import dom from '../../scripts/dom';
 import imageHelper from '../../utils/image';
 import '../../components/cardbuilder/card.scss';

src/controllers/dashboard/logs.js

@@ -1,6 +1,6 @@
 import datetime from '../../scripts/datetime';
 import loading from '../../components/loading/loading';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import '../../elements/emby-button/emby-button';
 import '../../components/listview/listview.scss';
 import '../../styles/flexstyles.scss';

src/controllers/dashboard/metadataImages.js

@@ -3,7 +3,7 @@ import { ImageResolution } from '@jellyfin/sdk/lib/generated-client/models/image
 import 'jquery';
 
 import loading from '../../components/loading/loading';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import Dashboard from '../../utils/dashboard';
 
 import '../../components/listview/listview.scss';

src/controllers/dashboard/metadatanfo.js

@@ -1,7 +1,7 @@
 import escapeHtml from 'escape-html';
 import 'jquery';
 import loading from '../../components/loading/loading';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import Dashboard from '../../utils/dashboard';
 import alert from '../../components/alert';
 

src/controllers/dashboard/networking.js

@@ -1,5 +1,5 @@
 import loading from '../../components/loading/loading';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-select/emby-select';
 import Dashboard from '../../utils/dashboard';

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

@@ -1,7 +1,7 @@
 import escapeHTML from 'escape-html';
 
 import loading from '../../../../components/loading/loading';
-import globalize from '../../../../scripts/globalize';
+import globalize from '../../../../lib/globalize';
 import '../../../../components/cardbuilder/card.scss';
 import '../../../../elements/emby-button/emby-button';
 import '../../../../elements/emby-checkbox/emby-checkbox';

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

@@ -1,6 +1,6 @@
 import loading from '../../../../components/loading/loading';
 import dom from '../../../../scripts/dom';
-import globalize from '../../../../scripts/globalize';
+import globalize from '../../../../lib/globalize';
 import '../../../../components/cardbuilder/card.scss';
 import '../../../../elements/emby-button/emby-button';
 import Dashboard, { pageIdOn } from '../../../../utils/dashboard';

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

@@ -1,5 +1,5 @@
 import loading from '../../../../components/loading/loading';
-import globalize from '../../../../scripts/globalize';
+import globalize from '../../../../lib/globalize';
 import dialogHelper from '../../../../components/dialogHelper/dialogHelper';
 import confirm from '../../../../components/confirm/confirm';
 

src/controllers/dashboard/scheduledtasks/scheduledtask.js

@@ -2,7 +2,7 @@ import 'jquery';
 import loading from '../../../components/loading/loading';
 import datetime from '../../../scripts/datetime';
 import dom from '../../../scripts/dom';
-import globalize from '../../../scripts/globalize';
+import globalize from '../../../lib/globalize';
 import '../../../elements/emby-input/emby-input';
 import '../../../elements/emby-button/emby-button';
 import '../../../elements/emby-select/emby-select';

src/controllers/dashboard/scheduledtasks/scheduledtasks.js

@@ -1,6 +1,6 @@
 import 'jquery';
 import loading from '../../../components/loading/loading';
-import globalize from '../../../scripts/globalize';
+import globalize from '../../../lib/globalize';
 import serverNotifications from '../../../scripts/serverNotifications';
 import { formatDistance, formatDistanceToNow } from 'date-fns';
 import { getLocale, getLocaleWithSuffix } from '../../../utils/dateFnsLocale.ts';

src/controllers/favorites.js

@@ -5,7 +5,7 @@ import layoutManager from 'components/layoutManager';
 import { appRouter } from 'components/router/appRouter';
 import ServerConnections from 'components/ServerConnections';
 import dom from 'scripts/dom';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card';
 import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by';
 

src/controllers/home.js

@@ -1,5 +1,5 @@
 import TabbedView from '../components/tabbedview/tabbedview';
-import globalize from '../scripts/globalize';
+import globalize from '../lib/globalize';
 import '../elements/emby-tabs/emby-tabs';
 import '../elements/emby-button/emby-button';
 import '../elements/emby-scroller/emby-scroller';

src/controllers/itemDetails/index.js

@@ -25,7 +25,7 @@ import browser from 'scripts/browser';
 import datetime from 'scripts/datetime';
 import dom from 'scripts/dom';
 import { download } from 'scripts/fileDownloader';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import libraryMenu from 'scripts/libraryMenu';
 import * as userSettings from 'scripts/settings/userSettings';
 import { getPortraitShape, getSquareShape } from 'utils/card';

src/controllers/list.js

@@ -1,4 +1,4 @@
-import globalize from '../scripts/globalize';
+import globalize from '../lib/globalize';
 import listView from '../components/listview/listview';
 import * as userSettings from '../scripts/settings/userSettings';
 import focusManager from '../components/focusManager';

src/controllers/livetv/livetvsuggested.js

@@ -3,7 +3,7 @@ import imageLoader from 'components/images/imageLoader';
 import layoutManager from 'components/layoutManager';
 import loading from 'components/loading/loading';
 import * as mainTabsManager from 'components/maintabsmanager';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import inputManager from 'scripts/inputManager';
 import * as userSettings from 'scripts/settings/userSettings';
 import { LibraryTab } from 'types/libraryTab';

src/controllers/livetvguideprovider.js

@@ -1,5 +1,5 @@
 import loading from '../components/loading/loading';
-import globalize from '../scripts/globalize';
+import globalize from '../lib/globalize';
 import Dashboard, { pageIdOn } from '../utils/dashboard';
 import { getParameterByName } from '../utils/url.ts';
 import Events from '../utils/events.ts';

src/controllers/livetvsettings.js

@@ -1,6 +1,6 @@
 import 'jquery';
 import loading from '../components/loading/loading';
-import globalize from '../scripts/globalize';
+import globalize from '../lib/globalize';
 import '../elements/emby-button/emby-button';
 import Dashboard from '../utils/dashboard';
 import alert from '../components/alert';

src/controllers/livetvstatus.js

@@ -1,5 +1,5 @@
 import 'jquery';
-import globalize from '../scripts/globalize';
+import globalize from '../lib/globalize';
 import taskButton from '../scripts/taskbutton';
 import dom from '../scripts/dom';
 import layoutManager from '../components/layoutManager';

src/controllers/livetvtuner.js

@@ -1,4 +1,4 @@
-import globalize from '../scripts/globalize';
+import globalize from '../lib/globalize';
 import loading from '../components/loading/loading';
 import dom from '../scripts/dom';
 import '../elements/emby-input/emby-input';

src/controllers/lyrics.js

@@ -9,9 +9,9 @@ import scrollManager from 'components/scrollManager';
 import focusManager from 'components/focusManager';
 
 import keyboardNavigation from 'scripts/keyboardNavigation';
-import globalize from '../scripts/globalize';
-import LibraryMenu from '../scripts/libraryMenu';
-import Events from '../utils/events.ts';
+import globalize from 'lib/globalize';
+import LibraryMenu from 'scripts/libraryMenu';
+import Events from 'utils/events';
 
 import '../styles/lyrics.scss';
 import { AutoScroll } from './lyrics.types';

src/controllers/movies/moviecollections.js

@@ -4,7 +4,7 @@ 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 globalize from '../../lib/globalize';
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 
 export default function (view, params, tabContent) {

src/controllers/movies/moviegenres.js

@@ -5,7 +5,7 @@ import layoutManager from 'components/layoutManager';
 import lazyLoader from 'components/lazyLoader/lazyLoaderIntersectionObserver';
 import loading from 'components/loading/loading';
 import { appRouter } from 'components/router/appRouter';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import * as userSettings from 'scripts/settings/userSettings';
 import { getBackdropShape, getPortraitShape } from 'utils/card';
 

src/controllers/movies/movies.js

@@ -4,7 +4,7 @@ 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 globalize from '../../lib/globalize';
 import Events from '../../utils/events.ts';
 import { playbackManager } from '../../components/playback/playbackmanager';
 

src/controllers/movies/moviesrecommended.js

@@ -6,7 +6,7 @@ import layoutManager from 'components/layoutManager';
 import * as mainTabsManager from 'components/maintabsmanager';
 import { playbackManager } from 'components/playback/playbackmanager';
 import dom from 'scripts/dom';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import inputManager from 'scripts/inputManager';
 import libraryMenu from 'scripts/libraryMenu';
 import * as userSettings from 'scripts/settings/userSettings';

src/controllers/movies/movietrailers.js

@@ -5,7 +5,7 @@ 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 globalize from '../../lib/globalize';
 import Events from '../../utils/events.ts';
 
 import '../../elements/emby-itemscontainer/emby-itemscontainer';

src/controllers/music/musicalbums.js

@@ -6,7 +6,7 @@ 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 globalize from '../../lib/globalize';
 import Events from '../../utils/events.ts';
 
 import '../../elements/emby-itemscontainer/emby-itemscontainer';

src/controllers/music/musicrecommended.js

@@ -5,7 +5,7 @@ import loading from 'components/loading/loading';
 import * as mainTabsManager from 'components/maintabsmanager';
 import browser from 'scripts/browser';
 import dom from 'scripts/dom';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import inputManager from 'scripts/inputManager';
 import libraryMenu from 'scripts/libraryMenu';
 import * as userSettings from 'scripts/settings/userSettings';

src/controllers/music/songs.js

@@ -5,7 +5,7 @@ import listView from '../../components/listview/listview';
 import loading from '../../components/loading/loading';
 import { playbackManager } from '../../components/playback/playbackmanager';
 import * as userSettings from '../../scripts/settings/userSettings';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import Dashboard from '../../utils/dashboard';
 import Events from '../../utils/events.ts';
 

src/controllers/playback/video/index.js

@@ -10,7 +10,7 @@ import itemHelper from '../../../components/itemHelper';
 import mediaInfo from '../../../components/mediainfo/mediainfo';
 import focusManager from '../../../components/focusManager';
 import Events from '../../../utils/events.ts';
-import globalize from '../../../scripts/globalize';
+import globalize from '../../../lib/globalize';
 import { appHost } from '../../../components/apphost';
 import layoutManager from '../../../components/layoutManager';
 import * as userSettings from '../../../scripts/settings/userSettings';

src/controllers/session/addServer/index.js

@@ -1,6 +1,6 @@
 import appSettings from '../../../scripts/settings/appSettings';
 import loading from '../../../components/loading/loading';
-import globalize from '../../../scripts/globalize';
+import globalize from '../../../lib/globalize';
 import '../../../elements/emby-button/emby-button';
 import Dashboard from '../../../utils/dashboard';
 import ServerConnections from '../../../components/ServerConnections';

src/controllers/session/forgotPassword/index.js

@@ -1,5 +1,5 @@
-import globalize from '../../../scripts/globalize';
-import Dashboard from '../../../utils/dashboard';
+import globalize from 'lib/globalize';
+import Dashboard from 'utils/dashboard';
 
 function processForgotPasswordResult(result) {
     if (result.Action == 'ContactAdmin') {

src/controllers/session/login/index.js

@@ -7,7 +7,7 @@ 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 globalize from '../../../lib/globalize';
 import '../../../components/cardbuilder/card.scss';
 import '../../../elements/emby-checkbox/emby-checkbox';
 import Dashboard from '../../../utils/dashboard';

src/controllers/session/resetPassword/index.js

@@ -1,5 +1,5 @@
-import globalize from '../../../scripts/globalize';
-import Dashboard from '../../../utils/dashboard';
+import globalize from 'lib/globalize';
+import Dashboard from 'utils/dashboard';
 
 function processForgotPasswordResult(result) {
     if (result.Success) {

src/controllers/session/selectServer/index.js

@@ -5,7 +5,7 @@ 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 globalize from '../../../lib/globalize';
 import actionSheet from '../../../components/actionSheet/actionSheet';
 import dom from '../../../scripts/dom';
 import browser from '../../../scripts/browser';

src/controllers/shows/episodes.js

@@ -4,7 +4,7 @@ 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 globalize from '../../lib/globalize';
 import Dashboard from '../../utils/dashboard';
 import Events from '../../utils/events.ts';
 

src/controllers/shows/tvgenres.js

@@ -5,7 +5,7 @@ import lazyLoader from 'components/lazyLoader/lazyLoaderIntersectionObserver';
 import layoutManager from 'components/layoutManager';
 import loading from 'components/loading/loading';
 import { appRouter } from 'components/router/appRouter';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import * as userSettings from 'scripts/settings/userSettings';
 import { getBackdropShape, getPortraitShape } from 'utils/card';
 

src/controllers/shows/tvrecommended.js

@@ -5,7 +5,7 @@ import loading from 'components/loading/loading';
 import * as mainTabsManager from 'components/maintabsmanager';
 import { playbackManager } from 'components/playback/playbackmanager';
 import dom from 'scripts/dom';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import inputManager from 'scripts/inputManager';
 import libraryMenu from 'scripts/libraryMenu';
 import * as userSettings from 'scripts/settings/userSettings';

src/controllers/shows/tvshows.js

@@ -5,7 +5,7 @@ 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 globalize from '../../lib/globalize';
 import Events from '../../utils/events.ts';
 
 import '../../elements/emby-itemscontainer/emby-itemscontainer';

src/controllers/shows/tvupcoming.js

@@ -3,7 +3,7 @@ import imageLoader from 'components/images/imageLoader';
 import layoutManager from 'components/layoutManager';
 import loading from 'components/loading/loading';
 import datetime from 'scripts/datetime';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { getBackdropShape } from 'utils/card';
 
 import 'elements/emby-itemscontainer/emby-itemscontainer';

src/controllers/user/controls/index.js

@@ -1,6 +1,6 @@
 import layoutManager from 'components/layoutManager';
 import toast from '../../../components/toast/toast';
-import globalize from '../../../scripts/globalize';
+import globalize from '../../../lib/globalize';
 import appSettings from '../../../scripts/settings/appSettings';
 import Events from '../../../utils/events.ts';
 

src/controllers/wizard/user/index.js

@@ -1,5 +1,5 @@
 import loading from '../../../components/loading/loading';
-import globalize from '../../../scripts/globalize';
+import globalize from '../../../lib/globalize';
 import '../../../styles/dashboard.scss';
 import '../../../elements/emby-input/emby-input';
 import '../../../elements/emby-button/emby-button';