Merge branch 'master' into migrate-to-ES6-68

package.json

@@ -154,6 +154,8 @@
           "src/components/playlisteditor/playlisteditor.js",
           "src/components/playmenu.js",
           "src/components/prompt/prompt.js",
+          "src/components/recordingcreator/seriesrecordingeditor.js",
+          "src/components/recordingcreator/recordinghelper.js",
           "src/components/refreshdialog/refreshdialog.js",
           "src/components/sanatizefilename.js",
           "src/components/scrollManager.js",
@@ -169,6 +171,8 @@
           "src/components/syncPlay/syncPlayManager.js",
           "src/components/syncPlay/timeSyncManager.js",
           "src/components/themeMediaPlayer.js",
+          "src/components/tvproviders/schedulesdirect.js",
+          "src/components/tvproviders/xmltv.js",
           "src/components/toast/toast.js",
           "src/components/upnextdialog/upnextdialog.js",
           "src/components/viewContainer.js",

src/components/recordingcreator/recordingbutton.js

@@ -1,6 +1,8 @@
 define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom', 'recordingHelper', 'events', 'paper-icon-button-light', 'emby-button', 'css!./recordingfields'], function (globalize, connectionManager, require, loading, appHost, dom, recordingHelper, events) {
     'use strict';
 
+    recordingHelper = recordingHelper.default || recordingHelper;
+
     function onRecordingButtonClick(e) {
         var item = this.item;
 

src/components/recordingcreator/recordingeditor.js

@@ -12,6 +12,8 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     function deleteTimer(apiClient, timerId) {
         return new Promise(function (resolve, reject) {
             require(['recordingHelper'], function (recordingHelper) {
+                recordingHelper = recordingHelper.default || recordingHelper;
+
                 recordingHelper.cancelTimerWithConfirmation(timerId, apiClient.serverId()).then(resolve, reject);
             });
         });

src/components/recordingcreator/recordingfields.js

@@ -1,6 +1,7 @@
 define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loading', 'apphost', 'dom', 'recordingHelper', 'events', 'paper-icon-button-light', 'emby-button', 'css!./recordingfields', 'flexStyles'], function (globalize, connectionManager, serverNotifications, require, loading, appHost, dom, recordingHelper, events) {
     'use strict';
 
+    recordingHelper = recordingHelper.default || recordingHelper;
     loading = loading.default || loading;
 
     function loadData(parent, program, apiClient) {

src/components/recordingcreator/recordinghelper.js

@@ -1,7 +1,8 @@
-define(['globalize', 'loading', 'connectionManager'], function (globalize, loading, connectionManager) {
+import globalize from 'globalize';
-    'use strict';
+import loading from 'loading';
+import connectionManager from 'connectionManager';
 
-    loading = loading.default || loading;
+/*eslint prefer-const: "error"*/
 
 function changeRecordingToSeries(apiClient, timerId, programId, confirmTimerCancellation) {
     loading.show();
@@ -28,7 +29,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
 
 function cancelTimerWithConfirmation(timerId, serverId) {
     return new Promise(function (resolve, reject) {
-            require(['confirm'], function (confirm) {
+        import('confirm').then(({ default: confirm }) => {
             confirm.default({
 
                 text: globalize.translate('MessageConfirmRecordingCancellation'),
@@ -39,7 +40,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
             }).then(function () {
                 loading.show();
 
-                    var apiClient = connectionManager.getApiClient(serverId);
+                const apiClient = connectionManager.getApiClient(serverId);
                 cancelTimer(apiClient, timerId, true).then(resolve, reject);
             }, reject);
         });
@@ -48,7 +49,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
 
 function cancelSeriesTimerWithConfirmation(timerId, serverId) {
     return new Promise(function (resolve, reject) {
-            require(['confirm'], function (confirm) {
+        import('confirm').then(({ default: confirm }) => {
             confirm.default({
 
                 text: globalize.translate('MessageConfirmRecordingCancellation'),
@@ -59,9 +60,9 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
             }).then(function () {
                 loading.show();
 
-                    var apiClient = connectionManager.getApiClient(serverId);
+                const apiClient = connectionManager.getApiClient(serverId);
                 apiClient.cancelLiveTvSeriesTimer(timerId).then(function () {
-                        require(['toast'], function (toast) {
+                    import('toast').then(({default: toast}) => {
                         toast(globalize.translate('SeriesCancelled'));
                     });
 
@@ -86,7 +87,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
 function createRecording(apiClient, programId, isSeries) {
     loading.show();
     return apiClient.getNewLiveTvTimerDefaults({ programId: programId }).then(function (item) {
-            var promise = isSeries ?
+        const promise = isSeries ?
             apiClient.createLiveTvSeriesTimer(item) :
             apiClient.createLiveTvTimer(item);
 
@@ -98,15 +99,15 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
 }
 
 function sendToast(msg) {
-        require(['toast'], function (toast) {
+    import('toast').then(({ default: toast }) => {
         toast(msg);
     });
 }
 
 function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus, seriesTimerId) {
     return new Promise(function (resolve, reject) {
-            require(['dialog'], function (dialog) {
+        import('dialog').then(({ default: dialog }) => {
-                var items = [];
+            const items = [];
 
             items.push({
                 name: globalize.translate('HeaderKeepRecording'),
@@ -140,7 +141,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
                 buttons: items
 
             }).then(function (result) {
-                    var apiClient = connectionManager.getApiClient(serverId);
+                const apiClient = connectionManager.getApiClient(serverId);
 
                 if (result === 'canceltimer') {
                     loading.show();
@@ -150,7 +151,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
                     loading.show();
 
                     apiClient.cancelLiveTvSeriesTimer(seriesTimerId).then(function () {
-                            require(['toast'], function (toast) {
+                        import('toast').then(({ default: toast }) => {
                             toast(globalize.translate('SeriesCancelled'));
                         });
 
@@ -166,8 +167,8 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
 }
 
 function toggleRecording(serverId, programId, timerId, timerStatus, seriesTimerId) {
-        var apiClient = connectionManager.getApiClient(serverId);
+    const apiClient = connectionManager.getApiClient(serverId);
-        var hasTimer = timerId && timerStatus !== 'Cancelled';
+    const hasTimer = timerId && timerStatus !== 'Cancelled';
     if (seriesTimerId && hasTimer) {
         // cancel
         return showMultiCancellationPrompt(serverId, programId, timerId, timerStatus, seriesTimerId);
@@ -183,7 +184,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
     }
 }
 
-    return {
+export default {
     cancelTimer: cancelTimer,
     createRecording: createRecording,
     changeRecordingToSeries: changeRecordingToSeries,
@@ -191,4 +192,4 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
     cancelTimerWithConfirmation: cancelTimerWithConfirmation,
     cancelSeriesTimerWithConfirmation: cancelSeriesTimerWithConfirmation
 };
-});
+

src/components/recordingcreator/seriesrecordingeditor.js

@@ -1,23 +1,38 @@
-define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'connectionManager', 'require', 'loading', 'scrollHelper', 'imageLoader', 'datetime', 'scrollStyles', 'emby-button', 'emby-checkbox', 'emby-input', 'emby-select', 'paper-icon-button-light', 'css!./../formdialog', 'css!./recordingcreator', 'material-icons', 'flexStyles'], function (dialogHelper, globalize, layoutManager, mediaInfo, appHost, connectionManager, require, loading, scrollHelper, imageLoader, datetime) {
+import dialogHelper from 'dialogHelper';
-    'use strict';
+import globalize from 'globalize';
+import layoutManager from 'layoutManager';
+import connectionManager from 'connectionManager';
+import loading from 'loading';
+import scrollHelper from 'scrollHelper';
+import datetime from 'datetime';
+import 'scrollStyles';
+import 'emby-button';
+import 'emby-checkbox';
+import 'emby-input';
+import 'emby-select';
+import 'paper-icon-button-light';
+import 'css!./../formdialog';
+import 'css!./recordingcreator';
+import 'material-icons';
+import 'flexStyles';
 
-    loading = loading.default || loading;
+/*eslint prefer-const: "error"*/
 
-    var currentDialog;
+let currentDialog;
-    var recordingUpdated = false;
+let recordingUpdated = false;
-    var recordingDeleted = false;
+let recordingDeleted = false;
-    var currentItemId;
+let currentItemId;
-    var currentServerId;
+let currentServerId;
 
 function deleteTimer(apiClient, timerId) {
     return new Promise(function (resolve, reject) {
-            require(['recordingHelper'], function (recordingHelper) {
+        import('recordingHelper').then(({ default: recordingHelper }) => {
             recordingHelper.cancelSeriesTimerWithConfirmation(timerId, apiClient.serverId()).then(resolve, reject);
         });
     });
 }
 
-    function renderTimer(context, item, apiClient) {
+function renderTimer(context, item) {
     context.querySelector('#txtPrePaddingMinutes').value = item.PrePaddingSeconds / 60;
     context.querySelector('#txtPostPaddingMinutes').value = item.PostPaddingSeconds / 60;
 
@@ -47,9 +62,9 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
 }
 
 function onSubmit(e) {
-        var form = this;
+    const form = this;
 
-        var apiClient = connectionManager.getApiClient(currentServerId);
+    const apiClient = connectionManager.getApiClient(currentServerId);
 
     apiClient.getLiveTvSeriesTimer(currentItemId).then(function (item) {
         item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
@@ -77,7 +92,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     });
 
     context.querySelector('.btnCancelRecording').addEventListener('click', function () {
-            var apiClient = connectionManager.getApiClient(currentServerId);
+        const apiClient = connectionManager.getApiClient(currentServerId);
         deleteTimer(apiClient, currentItemId).then(function () {
             closeDialog(true);
         });
@@ -87,29 +102,29 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
 }
 
 function reload(context, id) {
-        var apiClient = connectionManager.getApiClient(currentServerId);
+    const apiClient = connectionManager.getApiClient(currentServerId);
 
     loading.show();
     if (typeof id === 'string') {
         currentItemId = id;
 
         apiClient.getLiveTvSeriesTimer(id).then(function (result) {
-                renderTimer(context, result, apiClient);
+            renderTimer(context, result);
             loading.hide();
         });
     } else if (id) {
         currentItemId = id.Id;
 
-            renderTimer(context, id, apiClient);
+        renderTimer(context, id);
         loading.hide();
     }
 }
 
 function fillKeepUpTo(context) {
-        var html = '';
+    let html = '';
 
-        for (var i = 0; i <= 50; i++) {
+    for (let i = 0; i <= 50; i++) {
-            var text;
+        let text;
 
         if (i === 0) {
             text = globalize.translate('AsManyAsPossible');
@@ -125,7 +140,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     context.querySelector('.selectKeepUpTo').innerHTML = html;
 }
 
-    function onFieldChange(e) {
+function onFieldChange() {
     this.querySelector('.btnSubmit').click();
 }
 
@@ -136,8 +151,8 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     loading.show();
     options = options || {};
 
-        require(['text!./seriesrecordingeditor.template.html'], function (template) {
+    import('text!./seriesrecordingeditor.template.html').then(({ default: template }) => {
-            var dialogOptions = {
+        const dialogOptions = {
             removeOnClose: true,
             scrollY: false
         };
@@ -148,7 +163,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
             dialogOptions.size = 'small';
         }
 
-            var dlg = options.context;
+        const dlg = options.context;
 
         dlg.classList.add('hide');
         dlg.innerHTML = globalize.translateHtml(template, 'core');
@@ -178,8 +193,8 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
         loading.show();
         options = options || {};
 
-            require(['text!./seriesrecordingeditor.template.html'], function (template) {
+        import('text!./seriesrecordingeditor.template.html').then(({ default: template }) => {
-                var dialogOptions = {
+            const dialogOptions = {
                 removeOnClose: true,
                 scrollY: false
             };
@@ -190,7 +205,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
                 dialogOptions.size = 'small';
             }
 
-                var dlg = dialogHelper.createDialog(dialogOptions);
+            const dlg = dialogHelper.createDialog(dialogOptions);
 
             dlg.classList.add('formDialog');
             dlg.classList.add('recordingDialog');
@@ -199,7 +214,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
                 dlg.style['min-width'] = '20%';
             }
 
-                var html = '';
+            let html = '';
 
             html += globalize.translateHtml(template, 'core');
 
@@ -241,8 +256,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     });
 }
 
-    return {
+export default {
     show: showEditor,
     embed: embed
 };
-});

src/components/tvproviders/schedulesdirect.js

@@ -1,13 +1,19 @@
-define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'listViewStyle', 'emby-input', 'emby-select', 'emby-button', 'flexStyles'], function ($, loading, globalize) {
+import $ from 'jQuery';
-    'use strict';
+import loading from 'loading';
+import globalize from 'globalize';
+import 'emby-checkbox';
+import 'emby-input';
+import 'listViewStyle';
+import 'paper-icon-button-light';
+import 'emby-select';
+import 'emby-button';
+import 'flexStyles';
 
-    loading = loading.default || loading;
+export default function (page, providerId, options) {
-
-    return function (page, providerId, options) {
     function reload() {
         loading.show();
         ApiClient.getNamedConfiguration('livetv').then(function (config) {
-                var info = config.ListingProviders.filter(function (i) {
+            const info = config.ListingProviders.filter(function (i) {
                 return i.Id === providerId;
             })[0] || {};
             listingsId = info.ListingsId;
@@ -37,12 +43,12 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'listViewStyle', 'emb
 
     function setCountry(info) {
         ApiClient.getJSON(ApiClient.getUrl('LiveTv/ListingProviders/SchedulesDirect/Countries')).then(function (result) {
-                var i;
+            let i;
-                var length;
+            let length;
-                var countryList = [];
+            const countryList = [];
 
-                for (var region in result) {
+            for (const region in result) {
-                    var countries = result[region];
+                const countries = result[region];
 
                 if (countries.length && region !== 'ZZZ') {
                     for (i = 0, length = countries.length; i < length; i++) {
@@ -82,20 +88,20 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'listViewStyle', 'emb
             return Promise.resolve('');
         }
 
-            var buffer = new TextEncoder('utf-8').encode(str);
+        const buffer = new TextEncoder('utf-8').encode(str);
         return crypto.subtle.digest('SHA-256', buffer).then(function (hash) {
             return hex(hash);
         });
     }
 
     function hex(buffer) {
-            var hexCodes = [];
+        const hexCodes = [];
-            var view = new DataView(buffer);
+        const view = new DataView(buffer);
 
-            for (var i = 0; i < view.byteLength; i += 4) {
+        for (let i = 0; i < view.byteLength; i += 4) {
-                var value = view.getUint32(i);
+            const value = view.getUint32(i);
-                var stringValue = value.toString(16);
+            const stringValue = value.toString(16);
-                var paddedValue = ('00000000' + stringValue).slice(-'00000000'.length);
+            const paddedValue = ('00000000' + stringValue).slice(-'00000000'.length);
             hexCodes.push(paddedValue);
         }
 
@@ -105,14 +111,14 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'listViewStyle', 'emb
     function submitLoginForm() {
         loading.show();
         sha256(page.querySelector('.txtPass').value).then(function (passwordHash) {
-                var info = {
+            const info = {
                 Type: 'SchedulesDirect',
                 Username: page.querySelector('.txtUser').value,
                 EnableAllTuners: true,
                 Password: passwordHash,
                 Pw: page.querySelector('.txtPass').value
             };
-                var id = providerId;
+            const id = providerId;
 
             if (id) {
                 info.Id = id;
@@ -139,7 +145,7 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'listViewStyle', 'emb
     }
 
     function submitListingsForm() {
-            var selectedListingsId = $('#selectListing', page).val();
+        const selectedListingsId = $('#selectListing', page).val();
 
         if (!selectedListingsId) {
             return void Dashboard.alert({
@@ -148,9 +154,9 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'listViewStyle', 'emb
         }
 
         loading.show();
-            var id = providerId;
+        const id = providerId;
         ApiClient.getNamedConfiguration('livetv').then(function (config) {
-                var info = config.ListingProviders.filter(function (i) {
+            const info = config.ListingProviders.filter(function (i) {
                 return i.Id === id;
             })[0];
             info.ZipCode = page.querySelector('.txtZipCode').value;
@@ -233,14 +239,14 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'listViewStyle', 'emb
     }
 
     function refreshTunerDevices(page, providerInfo, devices) {
-            var html = '';
+        let html = '';
 
-            for (var i = 0, length = devices.length; i < length; i++) {
+        for (let i = 0, length = devices.length; i < length; i++) {
-                var device = devices[i];
+            const device = devices[i];
             html += '<div class="listItem">';
-                var enabledTuners = providerInfo.EnabledTuners || [];
+            const enabledTuners = providerInfo.EnabledTuners || [];
-                var isChecked = providerInfo.EnableAllTuners || enabledTuners.indexOf(device.Id) !== -1;
+            const isChecked = providerInfo.EnableAllTuners || enabledTuners.indexOf(device.Id) !== -1;
-                var checkedAttribute = isChecked ? ' checked' : '';
+            const checkedAttribute = isChecked ? ' checked' : '';
             html += '<label class="checkboxContainer listItemCheckboxContainer"><input type="checkbox" is="emby-checkbox" data-id="' + device.Id + '" class="chkTuner" ' + checkedAttribute + '/><span></span></label>';
             html += '<div class="listItemBody two-line">';
             html += '<div class="listItemBodyText">';
@@ -256,8 +262,8 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'listViewStyle', 'emb
         page.querySelector('.tunerList').innerHTML = html;
     }
 
-        var listingsId;
+    let listingsId;
-        var self = this;
+    const self = this;
 
     self.submit = function () {
         page.querySelector('.btnSubmitListingsContainer').click();
@@ -268,10 +274,10 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'listViewStyle', 'emb
 
         // Only hide the buttons if explicitly set to false; default to showing if undefined or null
         // FIXME: rename this option to clarify logic
-            var hideCancelButton = options.showCancelButton === false;
+        const hideCancelButton = options.showCancelButton === false;
         page.querySelector('.btnCancel').classList.toggle('hide', hideCancelButton);
 
-            var hideSubmitButton = options.showSubmitButton === false;
+        const hideSubmitButton = options.showSubmitButton === false;
         page.querySelector('.btnSubmitListings').classList.toggle('hide', hideSubmitButton);
 
         $('.formLogin', page).on('submit', function () {
@@ -295,5 +301,4 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'listViewStyle', 'emb
         $('.createAccountHelp', page).html(globalize.translate('MessageCreateAccountAt', '<a is="emby-linkbutton" class="button-link" href="http://www.schedulesdirect.org" target="_blank">http://www.schedulesdirect.org</a>'));
         reload();
     };
-    };
+}
-});

src/components/tvproviders/xmltv.js

@@ -1,12 +1,15 @@
-define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'emby-input', 'listViewStyle', 'paper-icon-button-light'], function ($, loading, globalize) {
+import $ from 'jQuery';
-    'use strict';
+import loading from 'loading';
+import globalize from 'globalize';
+import 'emby-checkbox';
+import 'emby-input';
+import 'listViewStyle';
+import 'paper-icon-button-light';
 
-    loading = loading.default || loading;
+export default function (page, providerId, options) {
-
-    return function (page, providerId, options) {
     function getListingProvider(config, id) {
         if (config && id) {
-                var result = config.ListingProviders.filter(function (provider) {
+            const result = config.ListingProviders.filter(function (provider) {
                 return provider.Id === id;
             })[0];
 
@@ -46,7 +49,7 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'emby-input', 'listVi
     }
 
     function getCategories(txtInput) {
-            var value = txtInput.value;
+        const value = txtInput.value;
 
         if (value) {
             return value.split('|');
@@ -57,9 +60,9 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'emby-input', 'listVi
 
     function submitListingsForm() {
         loading.show();
-            var id = providerId;
+        const id = providerId;
         ApiClient.getNamedConfiguration('livetv').then(function (config) {
-                var info = config.ListingProviders.filter(function (provider) {
+            const info = config.ListingProviders.filter(function (provider) {
                 return provider.Id === id;
             })[0] || {};
             info.Type = 'xmltv';
@@ -114,14 +117,14 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'emby-input', 'listVi
     }
 
     function refreshTunerDevices(page, providerInfo, devices) {
-            var html = '';
+        let html = '';
 
-            for (var i = 0, length = devices.length; i < length; i++) {
+        for (let i = 0, length = devices.length; i < length; i++) {
-                var device = devices[i];
+            const device = devices[i];
             html += '<div class="listItem">';
-                var enabledTuners = providerInfo.EnabledTuners || [];
+            const enabledTuners = providerInfo.EnabledTuners || [];
-                var isChecked = providerInfo.EnableAllTuners || enabledTuners.indexOf(device.Id) !== -1;
+            const isChecked = providerInfo.EnableAllTuners || enabledTuners.indexOf(device.Id) !== -1;
-                var checkedAttribute = isChecked ? ' checked' : '';
+            const checkedAttribute = isChecked ? ' checked' : '';
             html += '<label class="listItemCheckboxContainer"><input type="checkbox" is="emby-checkbox" class="chkTuner" data-id="' + device.Id + '" ' + checkedAttribute + '><span></span></label>';
             html += '<div class="listItemBody two-line">';
             html += '<div class="listItemBodyText">';
@@ -138,15 +141,15 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'emby-input', 'listVi
     }
 
     function onSelectPathClick(e) {
-            var page = $(e.target).parents('.xmltvForm')[0];
+        const page = $(e.target).parents('.xmltvForm')[0];
 
-            require(['directorybrowser'], function (directoryBrowser) {
+        import('directorybrowser').then(({default: directoryBrowser}) => {
-                var picker = new directoryBrowser.default();
+            const picker = new directoryBrowser();
             picker.show({
                 includeFiles: true,
                 callback: function (path) {
                     if (path) {
-                            var txtPath = page.querySelector('.txtPath');
+                        const txtPath = page.querySelector('.txtPath');
                         txtPath.value = path;
                         txtPath.focus();
                     }
@@ -156,7 +159,7 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'emby-input', 'listVi
         });
     }
 
-        var self = this;
+    const self = this;
 
     self.submit = function () {
         page.querySelector('.btnSubmitListings').click();
@@ -167,10 +170,10 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'emby-input', 'listVi
 
         // Only hide the buttons if explicitly set to false; default to showing if undefined or null
         // FIXME: rename this option to clarify logic
-            var hideCancelButton = options.showCancelButton === false;
+        const hideCancelButton = options.showCancelButton === false;
         page.querySelector('.btnCancel').classList.toggle('hide', hideCancelButton);
 
-            var hideSubmitButton = options.showSubmitButton === false;
+        const hideSubmitButton = options.showSubmitButton === false;
         page.querySelector('.btnSubmitListings').classList.toggle('hide', hideSubmitButton);
 
         $('form', page).on('submit', function () {
@@ -187,5 +190,4 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'emby-input', 'listVi
         });
         reload();
     };
-    };
+}
-});

src/strings/he.json

@@ -157,7 +157,7 @@
     "LabelBirthYear": "שנת לידה:",
     "LabelBlastMessageInterval": "תדירות הודעות דחיפה",
     "LabelBlastMessageIntervalHelp": "מגדיר את משך הזמן בשניות בין הודעות דחיפה של השרת.",
-    "LabelCachePath": "נתיב cache:",
+    "LabelCachePath": "נתיב מטמון:",
     "LabelChannels": "ערוצים:",
     "LabelCollection": "אוספים:",
     "LabelCommunityRating": "דירוג הקהילה:",
@@ -204,7 +204,7 @@
     "LabelMaxScreenshotsPerItem": "מספר תמונות מסך מקסימאלי לפריט:",
     "LabelMessageTitle": "כותרת הודעה:",
     "LabelMetadataDownloadLanguage": "שפת הורדה מועדפת:",
-    "LabelMetadataPath": "נתיב Metadata:",
+    "LabelMetadataPath": "נתיב מטא-דאטה:",
     "LabelMinBackdropDownloadWidth": "רוחב תמונת רקע מינימאלי להורדה:",
     "LabelMinResumeDuration": "משך המשכה מינימאלי:",
     "LabelMinResumeDurationHelp": "קובץ קצר מזה לא יהיה ניתן להמשך ניגון מנקודת העצירה",
@@ -302,7 +302,7 @@
     "OptionAlbumArtist": "אמן אלבום",
     "OptionAllUsers": "כל המשתמשים",
     "OptionAllowLinkSharing": "אפשר שיתוף ברשתות חברתיות",
-    "OptionAllowMediaPlayback": "הרשה נגינת מדיה",
+    "OptionAllowMediaPlayback": "אפשר ניגון מדיה",
     "OptionAllowUserToManageServer": "אפשר למשתמש זה לנהל את השרת",
     "OptionArtist": "אמן",
     "OptionAscending": "סדר עולה",
@@ -314,7 +314,7 @@
     "OptionContinuing": "ממשיך",
     "OptionCriticRating": "ציון מבקרים",
     "OptionCustomUsers": "מותאם אישית",
-    "OptionDaily": "יומי",
+    "OptionDaily": "כל יום",
     "OptionDateAdded": "תאריך הוספה",
     "OptionDatePlayed": "תאריך ניגון",
     "OptionDescending": "סדר יורד",
@@ -337,7 +337,7 @@
     "OptionHasSubtitles": "כתוביות",
     "OptionHasThemeSong": "שיר נושא",
     "OptionHasThemeVideo": "סרט נושא",
-    "OptionHasTrailer": "טריילר",
+    "OptionHasTrailer": "קדימון",
     "OptionHideUser": "הסתר משתמש זה בחלון ההתחברות",
     "OptionImdbRating": "דירוג IMDb",
     "OptionLikes": "נבחרים",
@@ -348,27 +348,27 @@
     "OptionOnAppStartup": "בהפעלת התוכנה",
     "OptionOnInterval": "כל פרק זמן",
     "OptionParentalRating": "דירוג בקרת הורים",
-    "OptionPlayCount": "מספר השמעות",
+    "OptionPlayCount": "כמות ניגונים",
     "OptionPlayed": "נוגן",
-    "OptionPremiereDate": "תאריך שידור ראשון",
+    "OptionPremiereDate": "תאריך בכורה",
     "OptionProfileAudio": "צליל",
     "OptionProfilePhoto": "תמונה",
     "OptionProfileVideo": "וידאו",
     "OptionProfileVideoAudio": "צליל וידאו",
     "OptionResumable": "ניתן להמשיך",
-    "OptionRuntime": "משך",
+    "OptionRuntime": "זמן ריצה",
     "OptionSaturday": "שבת",
     "OptionSpecialEpisode": "ספיישלים",
     "OptionSunday": "ראשון",
     "OptionThursday": "חמישי",
-    "OptionTrackName": "שם השיר",
+    "OptionTrackName": "שם הרצועה",
     "OptionTuesday": "שלישי",
     "OptionTvdbRating": "דירוג TVDB",
     "OptionUnairedEpisode": "פרקים שלא שודרו",
     "OptionUnplayed": "לא נוגן",
     "OptionWakeFromSleep": "הער ממצב שינה",
     "OptionWednesday": "רביעי",
-    "OptionWeekly": "שבועי",
+    "OptionWeekly": "כל שבוע",
     "OriginalAirDateValue": "תאריך אוויר מקורי: {0}",
     "Overview": "סקירה כללית",
     "PackageInstallCancelled": "ההתקנה של {0} (גירסה {1}) בוטלה.",
@@ -419,7 +419,7 @@
     "SeriesSettings": "הגדרות סדרה",
     "SeriesYearToPresent": "{0} - היום",
     "ServerNameIsRestarting": "שרת Jellyfin - {0} מופעל מחדש.",
-    "ServerNameIsShuttingDown": "שרת Jellyfin - {0} נכבה.",
+    "ServerNameIsShuttingDown": "שרת Jellyfin - {0} בתהליך כיבוי.",
     "ServerUpdateNeeded": "שרת אמבי זה צריך להיות מעודכן. כדי להוריד את הגרסה העדכנית ביותר, בקר בכתובת {0}",
     "Settings": "הגדרות",
     "SettingsSaved": "ההגדרות נשמרו.",
@@ -800,5 +800,72 @@
     "LabelForgotPasswordUsernameHelp": "הכנס/י את שם המשתמש שלך, אם את/ה זוכר/ת אותו.",
     "LabelFont": "גופן:",
     "LabelFolder": "תיקייה:",
-    "LabelFileOrUrl": "קובץ או כתובת אינטרנט:"
+    "LabelFileOrUrl": "קובץ או כתובת אינטרנט:",
+    "Season": "עונה",
+    "OptionEnableAccessFromAllDevices": "אפשר גישה מכל המכשירים",
+    "Primary": "ראשי",
+    "Menu": "תפריט",
+    "LiveTV": "שידורים חיים",
+    "ManageLibrary": "נהל ספרייה",
+    "Logo": "לוגו",
+    "OptionDateAddedImportTime": "השתמש בתאריך הסריקה לתוך הספרייה",
+    "OptionDateAddedFileTime": "השתמש בתאריך יצירת הקובץ",
+    "OptionBlockTrailers": "קדימונים",
+    "OptionBlockMusic": "מוזיקה",
+    "OptionBlockLiveTvChannels": "ערוצי שידורים חיים",
+    "OptionBlockBooks": "ספרים",
+    "OptionAllowRemoteSharedDevices": "אפשר שליטה מרחוק על מכשירים משותפים",
+    "OptionAllowRemoteControlOthers": "אפשר שליטה מרחוק על משתמשים אחרים",
+    "SelectAdminUsername": "נא לבחור שם משתמש עבור חשבון המנהל.",
+    "OptionHideUserFromLoginHelp": "שימושי עבור חשבונות פרטיים או חשבונות מנהל מוסתרים. המשתמש יצטרך להזין את שם המשתמש והסיסמה ידנית על מנת להתחבר.",
+    "MessagePlayAccessRestricted": "התוכן הזה לא ניתן לניגון כרגע. למידע נוסף, נא ליצור קשר עם מנהל המערכת שלך.",
+    "MessageContactAdminToResetPassword": "נא ליצור קשר עם מנהל המערכת שלך על מנת לאפס את הסיסמה שלך.",
+    "HeaderAdmin": "מנהל",
+    "TabDisplay": "תצוגה",
+    "HeaderDisplay": "תצוגה",
+    "Suggestions": "המלצות",
+    "MessageSyncPlayNoGroupsAvailable": "אין קבוצות זמינות. התחל לנגן משהו קודם.",
+    "OptionHomeVideos": "תמונות",
+    "Home": "בית",
+    "LabelServerName": "שם השרת:",
+    "TabPlugins": "תוספים",
+    "MessageNoPluginsInstalled": "אין לך תוספים מותקנים.",
+    "MessageNoAvailablePlugins": "אין תוספים זמינים.",
+    "TabLogs": "יומני רישום",
+    "LabelLogs": "יומני רישום:",
+    "TabNetworking": "תקשורת",
+    "TabDVR": "ממיר-מקליט",
+    "HeaderDVR": "ממיר-מקליט",
+    "LabelScheduledTaskLastRan": "רץ לאחרונה {0}, במשך {1}.",
+    "LabelTheme": "ערכת נושא:",
+    "LabelTextSize": "גודל טקסט:",
+    "LabelTextColor": "צבע טקסט:",
+    "LabelSyncPlayAccessNone": "מבוטל עבור משתמש זה",
+    "LabelSyncPlayAccessJoinGroups": "אפשר למשתמש להצטרף לקבוצות",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "אפשר למשתמש ליצור קבוצות ולהצטרף אליהן",
+    "LabelSyncPlayLeaveGroup": "עזוב קבוצה",
+    "LabelSyncPlayNewGroupDescription": "צור קבוצה חדשה",
+    "LabelSyncPlayNewGroup": "קבוצה חדשה",
+    "MoreFromValue": "עוד מ{0}",
+    "Writers": "תסריטאים",
+    "DailyAt": "כל יום ב-{0}",
+    "OptionWeekends": "סופי שבוע",
+    "OptionWeekdays": "ימי חול",
+    "Unplayed": "לא נוגן",
+    "OptionSubstring": "מחרוזת משנה",
+    "OptionReleaseDate": "תאריך שחרור",
+    "OptionRegex": "ביטוי-רגולרי",
+    "OptionRandom": "אקראי",
+    "OptionPoster": "פוסטר",
+    "OptionNone": "כלום",
+    "OptionMax": "מקסימום",
+    "List": "רשימה",
+    "OptionList": "רשימה",
+    "OptionIsSD": "הבחנה רגילה (SD)",
+    "OptionIsHD": "הבחנה גבוהה (HD)",
+    "OptionExternallyDownloaded": "הורדה חיצונית",
+    "OptionEveryday": "כל יום",
+    "OptionEnableExternalContentInSuggestions": "הפעל תוכן חיצוני בהמלצות",
+    "OptionEnableAccessToAllLibraries": "אפשר גישה לכל הספריות",
+    "OptionEnableAccessToAllChannels": "אפשר גישה לכל הערוצים"
 }

src/strings/ru.json

@@ -1521,7 +1521,7 @@
     "EnableBlurHashHelp": "Рисунки, которые всё ещё загружаются, будут отображаться с размытым заполнением",
     "EnableBlurHash": "Включить размытые заполнители для изображений",
     "ButtonSyncPlay": "SyncPlay",
-    "ButtonCast": "В ролях",
+    "ButtonCast": "Транслировать",
     "TabRepositories": "Репозитории",
     "MessageNoGenresAvailable": "Разрешить поставщикам метаданных получать жанры из интернета.",
     "MessageAddRepository": "Если вы хотите добавить репозиторий, нажмите кнопку рядом с заголовком и заполните необходимую информацию.",