Merge pull request #2707 from grafixeyehero/fix-accese

Access module

.eslintrc.js

@@ -100,6 +100,7 @@ module.exports = {
                 'jQuery': 'readonly',
                 // Jellyfin globals
                 'ApiClient': 'writable',
+                'Events': 'writable',
                 'chrome': 'writable',
                 'DlnaProfilePage': 'writable',
                 'DashboardPage': 'writable',
@@ -115,6 +116,8 @@ module.exports = {
                 'Loading': 'writable',
                 'MetadataEditor': 'writable',
                 'PlaylistViewer': 'writable',
+                'ServerNotifications': 'writable',
+                'TaskButton': 'writable',
                 'UserParentalControlPage': 'writable',
                 'Windows': 'readonly'
             },

src/components/directorybrowser/directorybrowser.js

@@ -10,8 +10,6 @@ import '../formdialog.scss';
 import '../../elements/emby-button/emby-button';
 import alert from '../alert';
 
-/* eslint-disable indent */
-
 function getSystemInfo() {
     return systemInfo ? Promise.resolve(systemInfo) : ApiClient.getPublicSystemInfo().then(
         info => {
@@ -243,10 +241,11 @@ import alert from '../alert';
     }
 }
 
-    class directoryBrowser {
+let systemInfo;
-        constructor() {
+class DirectoryBrowser {
-            let currentDialog;
+        currentDialog;
-            this.show = options => {
+
+        show = options => {
             options = options || {};
             const fileOptions = {
                 includeDirectories: true
@@ -286,7 +285,7 @@ import alert from '../alert';
                     dlg.querySelector('.btnCloseDialog').addEventListener('click', () => {
                         dialogHelper.close(dlg);
                     });
-                        currentDialog = dlg;
+                    this.currentDialog = dlg;
                     dlg.querySelector('#txtDirectoryPickerPath').value = initialPath;
                     const txtNetworkPath = dlg.querySelector('#txtNetworkPath');
                     if (txtNetworkPath) {
@@ -298,15 +297,12 @@ import alert from '../alert';
                 }
             );
         };
-            this.close = () => {
+
-                if (currentDialog) {
+        close = () => {
-                    dialogHelper.close(currentDialog);
+            if (this.currentDialog) {
+                dialogHelper.close(this.currentDialog);
             }
         };
 }
-    }
 
-    let systemInfo;
+export default DirectoryBrowser;
-
-/* eslint-enable indent */
-export default directoryBrowser;

src/components/mediaLibraryCreator/mediaLibraryCreator.js

@@ -102,8 +102,8 @@ import template from './mediaLibraryCreator.template.html';
     function onAddButtonClick() {
         const page = dom.parentWithClass(this, 'dlg-librarycreator');
 
-        import('../directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
+        import('../directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-            const picker = new directoryBrowser();
+            const picker = new DirectoryBrowser();
             picker.show({
                 enableNetworkSharePath: true,
                 callback: function (path, networkSharePath) {

src/components/mediaLibraryEditor/mediaLibraryEditor.js

@@ -162,8 +162,8 @@ import template from './mediaLibraryEditor.template.html';
     }
 
     function showDirectoryBrowser(context, originalPath, networkPath) {
-        import('../directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
+        import('../directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-            const picker = new directoryBrowser();
+            const picker = new DirectoryBrowser();
             picker.show({
                 enableNetworkSharePath: true,
                 pathReadOnly: originalPath != null,

src/components/tvproviders/xmltv.js

@@ -145,8 +145,8 @@ export default function (page, providerId, options) {
     function onSelectPathClick(e) {
         const page = $(e.target).parents('.xmltvForm')[0];
 
-        import('../directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
+        import('../directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-            const picker = new directoryBrowser();
+            const picker = new DirectoryBrowser();
             picker.show({
                 includeFiles: true,
                 callback: function (path) {

src/controllers/dashboard/encodingsettings.js

@@ -217,8 +217,8 @@ import alert from '../../components/alert';
             setDecodingCodecsVisible(page, this.value);
         });
         $('#btnSelectEncoderPath', page).on('click.selectDirectory', function () {
-            import('../../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
+            import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-                const picker = new directoryBrowser();
+                const picker = new DirectoryBrowser();
                 picker.show({
                     includeFiles: true,
                     callback: function (path) {
@@ -232,8 +232,8 @@ import alert from '../../components/alert';
             });
         });
         $('#btnSelectTranscodingTempPath', page).on('click.selectDirectory', function () {
-            import('../../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
+            import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-                const picker = new directoryBrowser();
+                const picker = new DirectoryBrowser();
                 picker.show({
                     callback: function (path) {
                         if (path) {
@@ -249,8 +249,8 @@ import alert from '../../components/alert';
             });
         });
         $('#btnSelectFallbackFontPath', page).on('click.selectDirectory', function () {
-            import('../../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
+            import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-                const picker = new directoryBrowser();
+                const picker = new DirectoryBrowser();
                 picker.show({
                     includeDirectories: true,
                     callback: function (path) {

src/controllers/dashboard/general.js

@@ -55,8 +55,8 @@ import alert from '../../components/alert';
     const brandingConfigKey = 'branding';
     export default function (view) {
         $('#btnSelectCachePath', view).on('click.selectDirectory', function () {
-            import('../../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
+            import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-                const picker = new directoryBrowser();
+                const picker = new DirectoryBrowser();
                 picker.show({
                     callback: function (path) {
                         if (path) {
@@ -72,8 +72,8 @@ import alert from '../../components/alert';
             });
         });
         $('#btnSelectMetadataPath', view).on('click.selectDirectory', function () {
-            import('../../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
+            import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-                const picker = new directoryBrowser();
+                const picker = new DirectoryBrowser();
                 picker.show({
                     path: $('#txtMetadataPath', view).val(),
                     networkSharePath: $('#txtMetadataNetworkPath', view).val(),

src/controllers/dashboard/networking.js

@@ -181,8 +181,8 @@ import alert from '../../components/alert';
             }
         });
         view.querySelector('#btnSelectCertPath').addEventListener('click', function () {
-            import('../../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
+            import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-                const picker = new directoryBrowser();
+                const picker = new DirectoryBrowser();
                 picker.show({
                     includeFiles: true,
                     includeDirectories: true,

src/controllers/livetvsettings.js

@@ -60,8 +60,8 @@ $(document).on('pageinit', '#liveTvSettingsPage', function () {
     const page = this;
     $('.liveTvSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
     $('#btnSelectRecordingPath', page).on('click.selectDirectory', function () {
-        import('../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
+        import('../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-            const picker = new directoryBrowser();
+            const picker = new DirectoryBrowser();
             picker.show({
                 callback: function (path) {
                     if (path) {
@@ -75,8 +75,8 @@ $(document).on('pageinit', '#liveTvSettingsPage', function () {
         });
     });
     $('#btnSelectMovieRecordingPath', page).on('click.selectDirectory', function () {
-        import('../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
+        import('../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-            const picker = new directoryBrowser();
+            const picker = new DirectoryBrowser();
             picker.show({
                 callback: function (path) {
                     if (path) {
@@ -90,8 +90,8 @@ $(document).on('pageinit', '#liveTvSettingsPage', function () {
         });
     });
     $('#btnSelectSeriesRecordingPath', page).on('click.selectDirectory', function () {
-        import('../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
+        import('../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-            const picker = new directoryBrowser();
+            const picker = new DirectoryBrowser();
             picker.show({
                 callback: function (path) {
                     if (path) {
@@ -105,8 +105,8 @@ $(document).on('pageinit', '#liveTvSettingsPage', function () {
         });
     });
     $('#btnSelectPostProcessorPath', page).on('click.selectDirectory', function () {
-        import('../components/directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
+        import('../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-            const picker = new directoryBrowser();
+            const picker = new DirectoryBrowser();
             picker.show({
                 includeFiles: true,
                 callback: function (path) {

src/controllers/livetvtuner.js

@@ -212,8 +212,8 @@ export default function (view, params) {
         });
     });
     view.querySelector('.btnSelectPath').addEventListener('click', function () {
-        import('../components/directorybrowser/directorybrowser').then(({default: directorybrowser}) => {
+        import('../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
-            const picker = new directorybrowser();
+            const picker = new DirectoryBrowser();
             picker.show({
                 includeFiles: true,
                 callback: function (path) {

src/scripts/clientUtils.js

@@ -6,6 +6,10 @@ import baseAlert from '../components/alert';
 import baseConfirm from '../components/confirm/confirm';
 import globalize from '../scripts/globalize';
 import * as webSettings from './settings/webSettings';
+import datetime from '../scripts/datetime';
+import DirectoryBrowser from '../components/directorybrowser/directorybrowser';
+import dialogHelper from '../components/dialogHelper/dialogHelper';
+import itemIdentifier from '../components/itemidentifier/itemidentifier';
 
 export function getCurrentUser() {
     return window.ApiClient.getCurrentUser(false);
@@ -94,6 +98,12 @@ export function getPluginUrl(name) {
     return 'configurationpage?name=' + encodeURIComponent(name);
 }
 
+export function getConfigurationResourceUrl(name) {
+    return ApiClient.getUrl('web/ConfigurationPage', {
+        name: name
+    });
+}
+
 export function navigate(url, preserveQueryString) {
     if (!url) {
         throw new Error('url cannot be null or empty');
@@ -204,6 +214,7 @@ const Dashboard = {
     capabilities,
     confirm,
     getPluginUrl,
+    getConfigurationResourceUrl,
     getCurrentUser,
     getCurrentUserId,
     hideLoadingMsg,
@@ -215,7 +226,11 @@ const Dashboard = {
     processServerConfigurationUpdateResult,
     selectServer,
     serverAddress,
-    showLoadingMsg
+    showLoadingMsg,
+    datetime,
+    DirectoryBrowser,
+    dialogHelper,
+    itemIdentifier
 };
 
 // This is used in plugins and templates, so keep it defined for now.

src/scripts/serverNotifications.js

@@ -211,4 +211,6 @@ Events.on(ServerConnections, 'apiclientcreated', function (e, newApiClient) {
     bindEvents(newApiClient);
 });
 
+window.ServerNotifications = serverNotifications;
+
 export default serverNotifications;

src/scripts/site.js

@@ -37,6 +37,7 @@ import SyncPlayNoActivePlayer from '../components/syncPlay/ui/players/NoActivePl
 import SyncPlayHtmlVideoPlayer from '../components/syncPlay/ui/players/HtmlVideoPlayer';
 import SyncPlayHtmlAudioPlayer from '../components/syncPlay/ui/players/HtmlAudioPlayer';
 import { currentSettings } from './settings/userSettings';
+import taskButton from '../scripts/taskbutton';
 
 // TODO: Move this elsewhere
 window.getWindowLocationSearch = function(win) {
@@ -83,6 +84,10 @@ function loadCoreDictionary() {
 }
 
 function init() {
+    // This is used in plugins
+    window.Events = Events;
+    window.TaskButton = taskButton;
+
     serverAddress().then(server => {
         if (server) {
             ServerConnections.initApiClient(server);

src/scripts/taskbutton.js

@@ -5,7 +5,7 @@ import globalize from '../scripts/globalize';
 import '../elements/emby-button/emby-button';
 import ServerConnections from '../components/ServerConnections';
 
-export default function (options) {
+function taskbutton(options) {
     function pollTasks() {
         ServerConnections.getApiClient(serverId).getScheduledTasks({
             IsEnabled: true
@@ -120,3 +120,5 @@ export default function (options) {
         Events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
     }
 }
+
+export default taskbutton;