Merge remote-tracking branch 'upstream/master' into site-js-prepare-es6

.eslintrc.js

@@ -44,6 +44,7 @@ module.exports = {
         'no-unused-vars': ['error', { 'vars': 'all', 'args': 'none', 'ignoreRestSiblings': true }],
         'one-var': ['error', 'never'],
         'padded-blocks': ['error', 'never'],
+        //'prefer-const': ['error', {'destructuring': 'all'}],
         'quotes': ['error', 'single', { 'avoidEscape': true, 'allowTemplateLiterals': false }],
         'semi': ['error'],
         'space-before-blocks': ['error'],

package.json

@@ -6,8 +6,8 @@
   "license": "GPL-2.0-or-later",
   "devDependencies": {
     "@babel/core": "^7.11.1",
-    "@babel/eslint-parser": "^7.11.0",
+    "@babel/eslint-parser": "^7.11.3",
-    "@babel/eslint-plugin": "^7.11.0",
+    "@babel/eslint-plugin": "^7.11.3",
     "@babel/plugin-proposal-class-properties": "^7.10.1",
     "@babel/plugin-proposal-private-methods": "^7.10.1",
     "@babel/plugin-transform-modules-amd": "^7.10.5",
@@ -20,7 +20,7 @@
     "css-loader": "^4.2.1",
     "cssnano": "^4.1.10",
     "del": "^5.1.0",
-    "eslint": "^7.6.0",
+    "eslint": "^7.7.0",
     "eslint-plugin-compat": "^3.5.1",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.21.2",
@@ -95,6 +95,8 @@
           "src/components/alert.js",
           "src/components/alphaPicker/alphaPicker.js",
           "src/components/appFooter/appFooter.js",
+          "src/components/apphost.js",
+          "src/components/appRouter.js",
           "src/components/autoFocuser.js",
           "src/components/backdrop/backdrop.js",
           "src/components/cardbuilder/cardBuilder.js",
@@ -110,8 +112,11 @@
           "src/components/favoriteitems.js",
           "src/components/fetchhelper.js",
           "src/components/filterdialog/filterdialog.js",
+          "src/components/filtermenu/filtermenu.js",
           "src/components/focusManager.js",
           "src/components/groupedcards.js",
+          "src/components/guide/guide.js",
+          "src/components/guide/guide-settings.js",
           "src/components/homeScreenSettings/homeScreenSettings.js",
           "src/components/homesections/homesections.js",
           "src/components/htmlMediaHelper.js",
@@ -125,6 +130,8 @@
           "src/components/itemHelper.js",
           "src/components/itemidentifier/itemidentifier.js",
           "src/components/itemMediaInfo/itemMediaInfo.js",
+          "src/components/itemsrefresher.js",
+          "src/components/layoutManager.js",
           "src/components/lazyLoader/lazyLoaderIntersectionObserver.js",
           "src/components/libraryoptionseditor/libraryoptionseditor.js",
           "src/components/listview/listview.js",
@@ -136,6 +143,7 @@
           "src/components/metadataEditor/metadataEditor.js",
           "src/components/metadataEditor/personEditor.js",
           "src/components/multiSelect/multiSelect.js",
+          "src/components/notifications/notifications.js",
           "src/components/nowPlayingBar/nowPlayingBar.js",
           "src/components/playback/brightnessosd.js",
           "src/components/playback/mediasession.js",
@@ -153,28 +161,49 @@
           "src/components/playlisteditor/playlisteditor.js",
           "src/components/playmenu.js",
           "src/components/prompt/prompt.js",
+          "src/components/recordingcreator/recordingbutton.js",
+          "src/components/recordingcreator/recordingcreator.js",
           "src/components/recordingcreator/seriesrecordingeditor.js",
           "src/components/recordingcreator/recordinghelper.js",
           "src/components/refreshdialog/refreshdialog.js",
+          "src/components/recordingcreator/recordingeditor.js",
+          "src/components/recordingcreator/recordingfields.js",
+          "src/components/qualityOptions.js",
+          "src/components/remotecontrol/remotecontrol.js",
           "src/components/sanatizefilename.js",
           "src/components/scrollManager.js",
+          "src/plugins/experimentalWarnings/plugin.js",
+          "src/plugins/sessionPlayer/plugin.js",
+          "src/plugins/htmlAudioPlayer/plugin.js",
+          "src/plugins/chromecastPlayer/plugin.js",
+          "src/components/slideshow/slideshow.js",
+          "src/components/sortmenu/sortmenu.js",
           "src/plugins/htmlVideoPlayer/plugin.js",
+          "src/plugins/logoScreensaver/plugin.js",
+          "src/plugins/playAccessValidation/plugin.js",
           "src/components/search/searchfields.js",
           "src/components/search/searchresults.js",
           "src/components/settingshelper.js",
           "src/components/shortcuts.js",
+          "src/components/subtitleeditor/subtitleeditor.js",
+          "src/components/subtitlesync/subtitlesync.js",
           "src/components/subtitlesettings/subtitleappearancehelper.js",
           "src/components/subtitlesettings/subtitlesettings.js",
           "src/components/syncPlay/groupSelectionMenu.js",
           "src/components/syncPlay/playbackPermissionManager.js",
           "src/components/syncPlay/syncPlayManager.js",
           "src/components/syncPlay/timeSyncManager.js",
+          "src/components/themeMediaPlayer.js",
+          "src/components/tabbedview/tabbedview.js",
           "src/components/viewManager/viewManager.js",
           "src/components/tvproviders/schedulesdirect.js",
           "src/components/tvproviders/xmltv.js",
           "src/components/toast/toast.js",
+          "src/components/tunerPicker.js",
           "src/components/upnextdialog/upnextdialog.js",
+          "src/components/userdatabuttons/userdatabuttons.js",
           "src/components/viewContainer.js",
+          "src/components/viewSettings/viewSettings.js",
           "src/components/castSenderApi.js",
           "src/controllers/session/addServer/index.js",
           "src/controllers/session/forgotPassword/index.js",
@@ -198,13 +227,16 @@
           "src/controllers/music/musicplaylists.js",
           "src/controllers/music/musicrecommended.js",
           "src/controllers/music/songs.js",
-          "src/controllers/dashboard/mediaLibrary.js",
+          "src/controllers/dashboard/library.js",
           "src/controllers/dashboard/metadataImages.js",
           "src/controllers/dashboard/metadatanfo.js",
           "src/controllers/dashboard/networking.js",
-          "src/controllers/dashboard/notifications/notification.js",
+          "src/controllers/dashboard/notifications/notification/index.js",
-          "src/controllers/dashboard/notifications/notifications.js",
+          "src/controllers/dashboard/notifications/notifications/index.js",
           "src/controllers/dashboard/playback.js",
+          "src/controllers/dashboard/plugins/add/index.js",
+          "src/controllers/dashboard/plugins/installed/index.js",
+          "src/controllers/dashboard/plugins/available/index.js",
           "src/controllers/dashboard/plugins/repositories/index.js",
           "src/controllers/dashboard/scheduledtasks/scheduledtask.js",
           "src/controllers/dashboard/scheduledtasks/scheduledtasks.js",
@@ -216,6 +248,7 @@
           "src/controllers/dashboard/users/userparentalcontrol.js",
           "src/controllers/dashboard/users/userpasswordpage.js",
           "src/controllers/dashboard/users/userprofilespage.js",
+          "src/controllers/home.js",
           "src/controllers/list.js",
           "src/controllers/edititemmetadata.js",
           "src/controllers/favorites.js",
@@ -231,7 +264,9 @@
           "src/controllers/playback/queue/index.js",
           "src/controllers/playback/video/index.js",
           "src/controllers/searchpage.js",
+          "src/controllers/livetv/livetvguide.js",
           "src/controllers/livetvtuner.js",
+          "src/controllers/livetv/livetvsuggested.js",
           "src/controllers/livetvstatus.js",
           "src/controllers/livetvguideprovider.js",
           "src/controllers/livetvsettings.js",
@@ -298,11 +333,14 @@
           "src/scripts/filesystem.js",
           "src/scripts/globalize.js",
           "src/scripts/imagehelper.js",
+          "src/scripts/itembynamedetailpage.js",
           "src/scripts/inputManager.js",
           "src/scripts/autoThemes.js",
           "src/scripts/themeManager.js",
           "src/scripts/keyboardNavigation.js",
+          "src/scripts/libraryMenu.js",
           "src/scripts/libraryBrowser.js",
+          "src/scripts/livetvcomponents.js",
           "src/scripts/mouseManager.js",
           "src/scripts/multiDownload.js",
           "src/scripts/playlists.js",

src/assets/css/videoosd.css

@@ -7,7 +7,6 @@
 }
 
 .osdPoster img,
-.pageContainer,
 .videoOsdBottom {
     bottom: 0;
     left: 0;
@@ -248,11 +247,6 @@
     animation: spin 4s linear infinite;
 }
 
-.pageContainer {
-    top: 0;
-    position: fixed;
-}
-
 @media all and (max-width: 30em) {
     .btnFastForward,
     .btnRewind,

src/bundle.js

@@ -2,159 +2,159 @@
  * require.js module definitions bundled by webpack
  */
 // Use define from require.js not webpack's define
-var _define = window.define;
+const _define = window.define;
 
 // fetch
-var fetch = require('whatwg-fetch');
+const fetch = require('whatwg-fetch');
 _define('fetch', function() {
     return fetch;
 });
 
 // Blurhash
-var blurhash = require('blurhash');
+const blurhash = require('blurhash');
 _define('blurhash', function() {
     return blurhash;
 });
 
 // query-string
-var query = require('query-string');
+const query = require('query-string');
 _define('queryString', function() {
     return query;
 });
 
 // flvjs
-var flvjs = require('flv.js/dist/flv').default;
+const flvjs = require('flv.js/dist/flv').default;
 _define('flvjs', function() {
     return flvjs;
 });
 
 // jstree
-var jstree = require('jstree');
+const jstree = require('jstree');
 require('jstree/dist/themes/default/style.css');
 _define('jstree', function() {
     return jstree;
 });
 
 // jquery
-var jquery = require('jquery');
+const jquery = require('jquery');
 _define('jQuery', function() {
     return jquery;
 });
 
 // hlsjs
-var hlsjs = require('hls.js');
+const hlsjs = require('hls.js');
 _define('hlsjs', function() {
     return hlsjs;
 });
 
 // howler
-var howler = require('howler');
+const howler = require('howler');
 _define('howler', function() {
     return howler;
 });
 
 // resize-observer-polyfill
-var resize = require('resize-observer-polyfill').default;
+const resize = require('resize-observer-polyfill').default;
 _define('resize-observer-polyfill', function() {
     return resize;
 });
 
 // swiper
-var swiper = require('swiper/js/swiper');
+const swiper = require('swiper/js/swiper');
 require('swiper/css/swiper.min.css');
 _define('swiper', function() {
     return swiper;
 });
 
 // sortable
-var sortable = require('sortablejs').default;
+const sortable = require('sortablejs').default;
 _define('sortable', function() {
     return sortable;
 });
 
 // webcomponents
-var webcomponents = require('webcomponents.js/webcomponents-lite');
+const webcomponents = require('webcomponents.js/webcomponents-lite');
 _define('webcomponents', function() {
     return webcomponents;
 });
 
 // libass-wasm
-var libassWasm = require('libass-wasm');
+const libassWasm = require('libass-wasm');
 _define('JavascriptSubtitlesOctopus', function() {
     return libassWasm;
 });
 
 // material-icons
-var materialIcons = require('material-design-icons-iconfont/dist/material-design-icons.css');
+const materialIcons = require('material-design-icons-iconfont/dist/material-design-icons.css');
 _define('material-icons', function() {
     return materialIcons;
 });
 
 // noto font
-var noto = require('jellyfin-noto');
+const noto = require('jellyfin-noto');
 _define('jellyfin-noto', function () {
     return noto;
 });
 
-var epubjs = require('epubjs');
+const epubjs = require('epubjs');
 _define('epubjs', function () {
     return epubjs;
 });
 
 // page.js
-var page = require('page');
+const page = require('page');
 _define('page', function() {
     return page;
 });
 
 // core-js
-var polyfill = require('@babel/polyfill/dist/polyfill');
+const polyfill = require('@babel/polyfill/dist/polyfill');
 _define('polyfill', function () {
     return polyfill;
 });
 
 // domtokenlist-shim
-var classlist = require('classlist.js');
+const classlist = require('classlist.js');
 _define('classlist-polyfill', function () {
     return classlist;
 });
 
 // Date-FNS
-var dateFns = require('date-fns');
+const dateFns = require('date-fns');
 _define('date-fns', function () {
     return dateFns;
 });
 
-var dateFnsLocale = require('date-fns/locale');
+const dateFnsLocale = require('date-fns/locale');
 _define('date-fns/locale', function () {
     return dateFnsLocale;
 });
 
-var fast_text_encoding = require('fast-text-encoding');
+const fast_text_encoding = require('fast-text-encoding');
 _define('fast-text-encoding', function () {
     return fast_text_encoding;
 });
 
 // intersection-observer
-var intersection_observer = require('intersection-observer');
+const intersection_observer = require('intersection-observer');
 _define('intersection-observer', function () {
     return intersection_observer;
 });
 
 // screenfull
-var screenfull = require('screenfull');
+const screenfull = require('screenfull');
 _define('screenfull', function () {
     return screenfull;
 });
 
 // headroom.js
-var headroom = require('headroom.js/dist/headroom');
+const headroom = require('headroom.js/dist/headroom');
 _define('headroom', function () {
     return headroom;
 });
 
 // apiclient
-var apiclient = require('jellyfin-apiclient');
+const apiclient = require('jellyfin-apiclient');
 
 _define('apiclient', function () {
     return apiclient.ApiClient;

src/components/accessSchedule/accessSchedule.template.html

@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" title="${LabelPrevious}" tabindex="-1">
+    <button is="paper-icon-button-light" class="btnCancel autoSize" title="${Previous}" tabindex="-1">
         <span class="material-icons arrow_back" aria-hidden="true"></span>
     </button>
     <h3 class="formDialogHeaderTitle">
@@ -12,13 +12,13 @@
 
             <div class="selectContainer">
                 <select is="emby-select" id="selectDay" label="${LabelAccessDay}">
-                    <option value="Sunday">${OptionSunday}</option>
+                    <option value="Sunday">${Sunday}</option>
-                    <option value="Monday">${OptionMonday}</option>
+                    <option value="Monday">${Monday}</option>
-                    <option value="Tuesday">${OptionTuesday}</option>
+                    <option value="Tuesday">${Tuesday}</option>
-                    <option value="Wednesday">${OptionWednesday}</option>
+                    <option value="Wednesday">${Wednesday}</option>
-                    <option value="Thursday">${OptionThursday}</option>
+                    <option value="Thursday">${Thursday}</option>
-                    <option value="Friday">${OptionFriday}</option>
+                    <option value="Friday">${Friday}</option>
-                    <option value="Saturday">${OptionSaturday}</option>
+                    <option value="Saturday">${Saturday}</option>
                     <option value="Everyday">${OptionEveryday}</option>
                     <option value="Weekday">${OptionWeekdays}</option>
                     <option value="Weekend">${OptionWeekends}</option>
@@ -33,7 +33,7 @@
 
             <div class="formDialogFooter">
                 <button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem">
-                    <span>${ButtonAdd}</span>
+                    <span>${Add}</span>
                 </button>
             </div>
         </form>

src/components/actionSheet/actionSheet.js

@@ -9,14 +9,14 @@ import 'scrollStyles';
 import 'listViewStyle';
 
 function getOffsets(elems) {
-    let results = [];
+    const results = [];
 
     if (!document) {
         return results;
     }
 
     for (const elem of elems) {
-        let box = elem.getBoundingClientRect();
+        const box = elem.getBoundingClientRect();
 
         results.push({
             top: box.top,
@@ -34,7 +34,7 @@ function getPosition(options, dlg) {
     const windowHeight = windowSize.innerHeight;
     const windowWidth = windowSize.innerWidth;
 
-    let pos = getOffsets([options.positionTo])[0];
+    const pos = getOffsets([options.positionTo])[0];
 
     if (options.positionY !== 'top') {
         pos.top += (pos.height || 0) / 2;
@@ -82,7 +82,7 @@ export function show(options) {
     // positionTo
     // showCancel
     // title
-    let dialogOptions = {
+    const dialogOptions = {
         removeOnClose: true,
         enableHistory: options.enableHistory,
         scrollY: false
@@ -103,7 +103,7 @@ export function show(options) {
         dialogOptions.autoFocus = false;
     }
 
-    let dlg = dialogHelper.createDialog(dialogOptions);
+    const dlg = dialogHelper.createDialog(dialogOptions);
 
     if (isFullscreen) {
         dlg.classList.add('actionsheet-fullscreen');
@@ -129,7 +129,7 @@ export function show(options) {
     }
 
     let renderIcon = false;
-    let icons = [];
+    const icons = [];
     let itemIcon;
     for (const item of options.items) {
         itemIcon = item.icon || (item.selected ? 'check' : null);
@@ -241,7 +241,7 @@ export function show(options) {
         centerFocus(dlg.querySelector('.actionSheetScroller'), false, true);
     }
 
-    let btnCloseActionSheet = dlg.querySelector('.btnCloseActionSheet');
+    const btnCloseActionSheet = dlg.querySelector('.btnCloseActionSheet');
     if (btnCloseActionSheet) {
         btnCloseActionSheet.addEventListener('click', function () {
             dialogHelper.close(dlg);

src/components/apphost.js

@@ -1,10 +1,12 @@
-define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'globalize'], function (appSettings, browser, events, htmlMediaHelper, webSettings, globalize) {
+import appSettings from 'appSettings';
-    'use strict';
+import browser from 'browser';
+import events from 'events';
+import * as htmlMediaHelper from 'htmlMediaHelper';
+import * as webSettings from 'webSettings';
+import globalize from 'globalize';
 
-    browser = browser.default || browser;
+function getBaseProfileOptions(item) {
-
+    const disableHlsVideoAudioCodecs = [];
-    function getBaseProfileOptions(item) {
-        var disableHlsVideoAudioCodecs = [];
 
     if (item && htmlMediaHelper.enableHlsJsPlayer(item.RunTimeTicks, item.MediaType)) {
         if (browser.edge) {
@@ -20,35 +22,17 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
         enableMkvProgressive: false,
         disableHlsVideoAudioCodecs: disableHlsVideoAudioCodecs
     };
-    }
+}
-
-    function getDeviceProfileForWindowsUwp(item) {
-        return new Promise(function (resolve, reject) {
-            require(['browserdeviceprofile', 'environments/windows-uwp/mediacaps'], function (profileBuilder, uwpMediaCaps) {
-                var profileOptions = getBaseProfileOptions(item);
-                profileOptions.supportsDts = uwpMediaCaps.supportsDTS();
-                profileOptions.supportsTrueHd = uwpMediaCaps.supportsDolby();
-                profileOptions.audioChannels = uwpMediaCaps.getAudioChannels();
-                resolve(profileBuilder(profileOptions));
-            });
-        });
-    }
-
-    function getDeviceProfile(item, options) {
-        options = options || {};
-
-        if (self.Windows) {
-            return getDeviceProfileForWindowsUwp(item);
-        }
 
+function getDeviceProfile(item, options = {}) {
     return new Promise(function (resolve) {
-            require(['browserdeviceprofile'], function (profileBuilder) {
+        import('browserdeviceprofile').then(({default: profileBuilder}) => {
-                var profile;
+            let profile;
 
             if (window.NativeShell) {
                 profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder);
             } else {
-                    var builderOpts = getBaseProfileOptions(item);
+                const builderOpts = getBaseProfileOptions(item);
                 builderOpts.enableSsaRender = (item && !options.isRetry && appSettings.get('subtitleburnin') !== 'allcomplexformats');
                 profile = profileBuilder(builderOpts);
             }
@@ -56,32 +40,32 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
             resolve(profile);
         });
     });
-    }
+}
 
-    function escapeRegExp(str) {
+function escapeRegExp(str) {
-        return str.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, '\\$1');
+    return str.replace(/([.*+?^=!:${}()|[\]/\\])/g, '\\$1');
-    }
+}
 
-    function replaceAll(originalString, strReplace, strWith) {
+function replaceAll(originalString, strReplace, strWith) {
-        var strReplace2 = escapeRegExp(strReplace);
+    const strReplace2 = escapeRegExp(strReplace);
-        var reg = new RegExp(strReplace2, 'ig');
+    const reg = new RegExp(strReplace2, 'ig');
     return originalString.replace(reg, strWith);
-    }
+}
 
-    function generateDeviceId() {
+function generateDeviceId() {
-        var keys = [];
+    const keys = [];
 
     if (keys.push(navigator.userAgent), keys.push(new Date().getTime()), self.btoa) {
-            var result = replaceAll(btoa(keys.join('|')), '=', '1');
+        const result = replaceAll(btoa(keys.join('|')), '=', '1');
         return Promise.resolve(result);
     }
 
     return Promise.resolve(new Date().getTime());
-    }
+}
 
-    function getDeviceId() {
+function getDeviceId() {
-        var key = '_deviceId2';
+    const key = '_deviceId2';
-        var deviceId = appSettings.get(key);
+    const deviceId = appSettings.get(key);
 
     if (deviceId) {
         return Promise.resolve(deviceId);
@@ -91,9 +75,9 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
         appSettings.set(key, deviceId);
         return deviceId;
     });
-    }
+}
 
-    function getDeviceName() {
+function getDeviceName() {
     var deviceName;
     if (browser.tizen) {
         deviceName = 'Samsung Smart TV';
@@ -130,47 +114,30 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
     }
 
     return deviceName;
-    }
+}
 
-    function supportsVoiceInput() {
+function supportsVoiceInput() {
     if (!browser.tv) {
         return window.SpeechRecognition || window.webkitSpeechRecognition || window.mozSpeechRecognition || window.oSpeechRecognition || window.msSpeechRecognition;
     }
 
     return false;
-    }
+}
 
-    function supportsFullscreen() {
+function supportsFullscreen() {
     if (browser.tv) {
         return false;
     }
 
-        var element = document.documentElement;
+    const element = document.documentElement;
     return (element.requestFullscreen || element.mozRequestFullScreen || element.webkitRequestFullscreen || element.msRequestFullscreen) || document.createElement('video').webkitEnterFullscreen;
-    }
+}
 
-    function getSyncProfile() {
+function getDefaultLayout() {
-        return new Promise(function (resolve) {
-            require(['browserdeviceprofile', 'appSettings'], function (profileBuilder, appSettings) {
-                var profile;
-
-                if (window.NativeShell) {
-                    profile = window.NativeShell.AppHost.getSyncProfile(profileBuilder, appSettings);
-                } else {
-                    profile = profileBuilder();
-                    profile.MaxStaticMusicBitrate = appSettings.maxStaticMusicBitrate();
-                }
-
-                resolve(profile);
-            });
-        });
-    }
-
-    function getDefaultLayout() {
     return 'desktop';
-    }
+}
 
-    function supportsHtmlMediaAutoplay() {
+function supportsHtmlMediaAutoplay() {
     if (browser.edgeUwp || browser.tizen || browser.web0s || browser.orsay || browser.operaTv || browser.ps4 || browser.xboxOne) {
         return true;
     }
@@ -180,18 +147,18 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
     }
 
     return true;
-    }
+}
 
-    function supportsCue() {
+function supportsCue() {
     try {
-            var video = document.createElement('video');
+        const video = document.createElement('video');
-            var style = document.createElement('style');
+        const style = document.createElement('style');
 
         style.textContent = 'video::cue {background: inherit}';
         document.body.appendChild(style);
         document.body.appendChild(video);
 
-            var cue = window.getComputedStyle(video, '::cue').background;
+        const cue = window.getComputedStyle(video, '::cue').background;
         document.body.removeChild(style);
         document.body.removeChild(video);
 
@@ -200,25 +167,25 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
         console.error('error detecting cue support: ' + err);
         return false;
     }
-    }
+}
 
-    function onAppVisible() {
+function onAppVisible() {
     if (isHidden) {
         isHidden = false;
         console.debug('triggering app resume event');
         events.trigger(appHost, 'resume');
     }
-    }
+}
 
-    function onAppHidden() {
+function onAppHidden() {
     if (!isHidden) {
         isHidden = true;
         console.debug('app is hidden');
     }
-    }
+}
 
-    var supportedFeatures = function () {
+const supportedFeatures = function () {
-        var features = [];
+    const features = [];
 
     if (navigator.share) {
         features.push('sharing');
@@ -300,12 +267,12 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
     }
 
     return features;
-    }();
+}();
 
-    /**
+/**
      * Do exit according to platform
      */
-    function doExit() {
+function doExit() {
     try {
         if (window.NativeShell) {
             window.NativeShell.AppHost.exit();
@@ -319,19 +286,19 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
     } catch (err) {
         console.error('error closing application: ' + err);
     }
-    }
+}
 
-    var exitPromise;
+let exitPromise;
 
-    /**
+/**
      * Ask user for exit
      */
-    function askForExit() {
+function askForExit() {
     if (exitPromise) {
         return;
     }
 
-        require(['actionsheet'], function (actionsheet) {
+    import('actionsheet').then(({default: actionsheet}) => {
         exitPromise = actionsheet.show({
             title: globalize.translate('MessageConfirmAppExit'),
             items: [
@@ -346,18 +313,18 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
             exitPromise = null;
         });
     });
-    }
+}
 
-    var deviceId;
+let deviceId;
-    var deviceName;
+let deviceName;
-    var appName = 'Jellyfin Web';
+const appName = 'Jellyfin Web';
-    var appVersion = '10.7.0';
+const appVersion = '10.7.0';
 
-    var appHost = {
+const appHost = {
     getWindowState: function () {
         return document.windowState || 'Normal';
     },
-        setWindowState: function (state) {
+    setWindowState: function () {
         alert('setWindowState is not supported and should not be called');
     },
     exit: function () {
@@ -375,7 +342,6 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
         return supportedFeatures.indexOf(command.toLowerCase()) !== -1;
     },
     preferVisualCards: browser.android || browser.chrome,
-        getSyncProfile: getSyncProfile,
     getDefaultLayout: function () {
         if (window.NativeShell) {
             return window.NativeShell.AppHost.getDefaultLayout();
@@ -411,37 +377,36 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
     },
     setUserScalable: function (scalable) {
         if (!browser.tv) {
-                var att = scalable ? 'width=device-width, initial-scale=1, minimum-scale=1, user-scalable=yes' : 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no';
+            const att = scalable ? 'width=device-width, initial-scale=1, minimum-scale=1, user-scalable=yes' : 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no';
             document.querySelector('meta[name=viewport]').setAttribute('content', att);
         }
     }
-    };
+};
 
-    var isHidden = false;
+let isHidden = false;
-    var hidden;
+let hidden;
-    var visibilityChange;
+let visibilityChange;
 
-    if (typeof document.hidden !== 'undefined') { /* eslint-disable-line compat/compat */
+if (typeof document.hidden !== 'undefined') { /* eslint-disable-line compat/compat */
     hidden = 'hidden';
     visibilityChange = 'visibilitychange';
-    } else if (typeof document.webkitHidden !== 'undefined') {
+} else if (typeof document.webkitHidden !== 'undefined') {
     hidden = 'webkitHidden';
     visibilityChange = 'webkitvisibilitychange';
-    }
+}
 
-    document.addEventListener(visibilityChange, function () {
+document.addEventListener(visibilityChange, function () {
     /* eslint-disable-next-line compat/compat */
     if (document[hidden]) {
         onAppHidden();
     } else {
         onAppVisible();
     }
-    }, false);
+}, false);
 
-    if (self.addEventListener) {
+if (self.addEventListener) {
     self.addEventListener('focus', onAppVisible);
     self.addEventListener('blur', onAppHidden);
-    }
+}
 
-    return appHost;
+export default appHost;
-});

src/components/cardbuilder/cardBuilder.js

@@ -362,12 +362,12 @@ import 'programStyles';
             let hasOpenRow;
             let hasOpenSection;
 
-            let sectionTitleTagName = options.sectionTitleTagName || 'div';
+            const sectionTitleTagName = options.sectionTitleTagName || 'div';
             let apiClient;
             let lastServerId;
 
             for (const [i, item] of items.entries()) {
-                let serverId = item.ServerId || options.serverId;
+                const serverId = item.ServerId || options.serverId;
 
                 if (serverId !== lastServerId) {
                     lastServerId = serverId;
@@ -621,7 +621,7 @@ import 'programStyles';
                 });
             }
 
-            let blurHashes = options.imageBlurhashes || item.ImageBlurHashes || {};
+            const blurHashes = options.imageBlurhashes || item.ImageBlurHashes || {};
 
             return {
                 imgUrl: imgUrl,
@@ -656,7 +656,7 @@ import 'programStyles';
                 for (let i = 0; i < character.length; i++) {
                     sum += parseInt(character.charAt(i));
                 }
-                let index = String(sum).substr(-1);
+                const index = String(sum).substr(-1);
 
                 return (index % numRandomColors) + 1;
             } else {
@@ -682,7 +682,7 @@ import 'programStyles';
 
             for (let i = 0; i < lines.length; i++) {
                 let currentCssClass = cssClass;
-                let text = lines[i];
+                const text = lines[i];
 
                 if (valid > 0 && isOuterFooter) {
                     currentCssClass += ' cardText-secondary';
@@ -707,7 +707,7 @@ import 'programStyles';
             }
 
             if (forceLines) {
-                let linesLength = maxLines || Math.min(lines.length, maxLines || lines.length);
+                const linesLength = maxLines || Math.min(lines.length, maxLines || lines.length);
 
                 while (valid < linesLength) {
                     html += "<div class='" + cssClass + "'>&nbsp;</div>";
@@ -1036,7 +1036,7 @@ import 'programStyles';
          * @returns {string} HTML markup for the item count indicator.
          */
         function getItemCountsHtml(options, item) {
-            let counts = [];
+            const counts = [];
             let childText;
 
             if (item.Type === 'Playlist') {
@@ -1318,7 +1318,7 @@ import 'programStyles';
             let cardBoxClose = '';
             let cardScalableClose = '';
 
-            let cardContentClass = 'cardContent';
+            const cardContentClass = 'cardContent';
 
             let blurhashAttrib = '';
             if (blurhash && blurhash.length > 0) {
@@ -1337,7 +1337,7 @@ import 'programStyles';
                 cardImageContainerClose = '</button>';
             }
 
-            let cardScalableClass = 'cardScalable';
+            const cardScalableClass = 'cardScalable';
 
             cardImageContainerOpen = '<div class="' + cardBoxClass + '"><div class="' + cardScalableClass + '"><div class="cardPadder cardPadder-' + shape + '"></div>' + cardImageContainerOpen;
             cardBoxClose = '</div>';
@@ -1681,7 +1681,7 @@ import 'programStyles';
             const cells = itemsContainer.querySelectorAll('.card[data-id="' + programId + '"]');
 
             for (let i = 0, length = cells.length; i < length; i++) {
-                let cell = cells[i];
+                const cell = cells[i];
                 const icon = cell.querySelector('.timerIndicator');
                 if (!icon) {
                     const indicatorsElem = ensureIndicators(cell);
@@ -1700,8 +1700,8 @@ import 'programStyles';
             const cells = itemsContainer.querySelectorAll('.card[data-timerid="' + timerId + '"]');
 
             for (let i = 0; i < cells.length; i++) {
-                let cell = cells[i];
+                const cell = cells[i];
-                let icon = cell.querySelector('.timerIndicator');
+                const icon = cell.querySelector('.timerIndicator');
                 if (icon) {
                     icon.parentNode.removeChild(icon);
                 }
@@ -1718,8 +1718,8 @@ import 'programStyles';
             const cells = itemsContainer.querySelectorAll('.card[data-seriestimerid="' + cancelledTimerId + '"]');
 
             for (let i = 0; i < cells.length; i++) {
-                let cell = cells[i];
+                const cell = cells[i];
-                let icon = cell.querySelector('.timerIndicator');
+                const icon = cell.querySelector('.timerIndicator');
                 if (icon) {
                     icon.parentNode.removeChild(icon);
                 }

src/components/channelMapper/channelMapper.js

@@ -19,11 +19,11 @@ export default class channelMapper {
             connectionManager.getApiClient(options.serverId).ajax({
                 type: 'POST',
                 url: ApiClient.getUrl('LiveTv/ChannelMappings'),
-                data: {
+                data: JSON.stringify({
                     providerId: providerId,
                     tunerChannelId: channelId,
                     providerChannelId: providerChannelId
-                },
+                }),
                 dataType: 'json'
             }).then(mapping => {
                 const listItem = dom.parentWithClass(button, 'listItem');
@@ -93,7 +93,7 @@ export default class channelMapper {
             html += '<div class="formDialogContent smoothScrollY">';
             html += '<div class="dialogContentInner dialog-content-centered">';
             html += '<form style="margin:auto;">';
-            html += `<h1>${globalize.translate('HeaderChannels')}</h1>`;
+            html += `<h1>${globalize.translate('Channels')}</h1>`;
             html += '<div class="channels paperList">';
             html += '</div>';
             html += '</form>';

src/components/dialogHelper/dialogHelper.js

@@ -375,7 +375,7 @@ import 'scrollStyles';
             dlg.setAttribute('data-lockscroll', 'true');
         }
 
-        if (options.enableHistory !== false && appRouter.enableNativeHistory()) {
+        if (options.enableHistory !== false) {
             dlg.setAttribute('data-history', 'true');
         }
 
@@ -391,11 +391,8 @@ import 'scrollStyles';
             dlg.setAttribute('data-autofocus', 'true');
         }
 
-        let defaultEntryAnimation;
+        const defaultEntryAnimation = 'scaleup';
-        let defaultExitAnimation;
+        const defaultExitAnimation = 'scaledown';
-
-        defaultEntryAnimation = 'scaleup';
-        defaultExitAnimation = 'scaledown';
         const entryAnimation = options.entryAnimation || defaultEntryAnimation;
         const exitAnimation = options.exitAnimation || defaultExitAnimation;
 

src/components/directorybrowser/directorybrowser.js

@@ -166,10 +166,10 @@ import 'emby-button';
         return apiClient.ajax({
             type: 'POST',
             url: apiClient.getUrl('Environment/ValidatePath'),
-            data: {
+            data: JSON.stringify({
                 ValidateWriteable: validateWriteable,
                 Path: path
-            }
+            })
         }).catch(response => {
             if (response) {
                 if (response.status === 404) {

src/components/displaySettings/displaySettings.template.html

@@ -162,7 +162,7 @@
     <div class="checkboxContainer checkboxContainer-withDescription fldBackdrops hide">
         <label>
             <input type="checkbox" is="emby-checkbox" id="chkBackdrops" />
-            <span>${EnableBackdrops}</span>
+            <span>${Backdrops}</span>
         </label>
         <div class="fieldDescription checkboxFieldDescription">${EnableBackdropsHelp}</div>
     </div>

src/components/filterdialog/filterdialog.template.html

@@ -1,6 +1,6 @@
 <div style="margin: 0;padding:1.5em 2em;" class="filterDialogContent">
 
-    <div is="emby-collapse" title="${HeaderFilters}">
+    <div is="emby-collapse" title="${Filters}">
         <div class="collapseContent">
             <div class="checkboxList">
                 <label>
@@ -63,7 +63,7 @@
         </div>
     </div>
 
-    <div is="emby-collapse" title="${HeaderFeatures}" class="features hide">
+    <div is="emby-collapse" title="${Features}" class="features hide">
         <div class="collapseContent">
             <div class="checkboxList">
                 <label>
@@ -90,7 +90,7 @@
         </div>
     </div>
 
-    <div is="emby-collapse" title="${HeaderGenres}" class="genreFilters hide">
+    <div is="emby-collapse" title="${Genres}" class="genreFilters hide">
         <div class="collapseContent filterOptions">
         </div>
     </div>
@@ -100,7 +100,7 @@
         </div>
     </div>
 
-    <div is="emby-collapse" title="${HeaderTags}" class="tagFilters hide">
+    <div is="emby-collapse" title="${Tags}" class="tagFilters hide">
         <div class="collapseContent filterOptions">
         </div>
     </div>

src/components/filtermenu/filtermenu.js

@@ -1,13 +1,25 @@
-define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost', 'inputManager', 'layoutManager', 'connectionManager', 'appRouter', 'globalize', 'userSettings', 'emby-checkbox', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button', 'flexStyles'], function (require, dom, focusManager, dialogHelper, loading, appHost, inputManager, layoutManager, connectionManager, appRouter, globalize, userSettings) {
+import dom from 'dom';
-    'use strict';
+import focusManager from 'focusManager';
-    focusManager = focusManager.default || focusManager;
+import dialogHelper from 'dialogHelper';
+import inputManager from 'inputManager';
+import layoutManager from 'layoutManager';
+import connectionManager from 'connectionManager';
+import globalize from 'globalize';
+import * as userSettings from 'userSettings';
+import 'emby-checkbox';
+import 'emby-input';
+import 'paper-icon-button-light';
+import 'emby-select';
+import 'material-icons';
+import 'css!./../formdialog';
+import 'emby-button';
+import 'flexStyles';
 
-    function onSubmit(e) {
+function onSubmit(e) {
     e.preventDefault();
     return false;
-    }
+}
-
+function renderOptions(context, selector, cssClass, items, isCheckedFn) {
-    function renderOptions(context, selector, cssClass, items, isCheckedFn) {
     var elem = context.querySelector(selector);
 
     if (items.length) {
@@ -31,32 +43,116 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
     }).join('');
 
     elem.querySelector('.filterOptions').innerHTML = html;
-    }
+}
 
-    function renderDynamicFilters(context, result, options) {
+function renderDynamicFilters(context, result, options) {
     renderOptions(context, '.genreFilters', 'chkGenreFilter', result.Genres, function (i) {
         // Switching from | to ,
         var delimeter = (options.settings.GenreIds || '').indexOf('|') === -1 ? ',' : '|';
         return (delimeter + (options.settings.GenreIds || '') + delimeter).indexOf(delimeter + i.Id + delimeter) !== -1;
     });
+}
+
+function setBasicFilter(context, key, elem) {
+    var value = elem.checked;
+    value = value ? value : null;
+    userSettings.setFilter(key, value);
+}
+function moveCheckboxFocus(elem, offset) {
+    var parent = dom.parentWithClass(elem, 'checkboxList-verticalwrap');
+    var elems = focusManager.getFocusableElements(parent);
+
+    var index = -1;
+    for (let i = 0, length = elems.length; i < length; i++) {
+        if (elems[i] === elem) {
+            index = i;
+            break;
+        }
     }
 
-    function loadDynamicFilters(context, options) {
+    index += offset;
-        var apiClient = connectionManager.getApiClient(options.serverId);
 
-        var filterMenuOptions = Object.assign(options.filterMenuOptions, {
+    index = Math.min(elems.length - 1, index);
+    index = Math.max(0, index);
 
-            UserId: apiClient.getCurrentUserId(),
+    var newElem = elems[index];
-            ParentId: options.parentId,
+    if (newElem) {
-            IncludeItemTypes: options.itemTypes.join(',')
+        focusManager.focus(newElem);
-        });
+    }
-
+}
-        apiClient.getFilters(filterMenuOptions).then(function (result) {
+function centerFocus(elem, horiz, on) {
-            renderDynamicFilters(context, result, options);
+    import('scrollHelper').then(({ default: scrollHelper }) => {
+        var fn = on ? 'on' : 'off';
+        scrollHelper.centerFocus[fn](elem, horiz);
     });
+}
+function onInputCommand(e) {
+    switch (e.detail.command) {
+        case 'left':
+            moveCheckboxFocus(e.target, -1);
+            e.preventDefault();
+            break;
+        case 'right':
+            moveCheckboxFocus(e.target, 1);
+            e.preventDefault();
+            break;
+        default:
+            break;
+    }
+}
+function saveValues(context, settings, settingsKey) {
+    var elems = context.querySelectorAll('.simpleFilter');
+    for (let i = 0, length = elems.length; i < length; i++) {
+        if (elems[i].tagName === 'INPUT') {
+            setBasicFilter(context, settingsKey + '-filter-' + elems[i].getAttribute('data-settingname'), elems[i]);
+        } else {
+            setBasicFilter(context, settingsKey + '-filter-' + elems[i].getAttribute('data-settingname'), elems[i].querySelector('input'));
+        }
     }
 
-    function initEditor(context, settings) {
+    // Video type
+    var videoTypes = [];
+    elems = context.querySelectorAll('.chkVideoTypeFilter');
+
+    for (let i = 0, length = elems.length; i < length; i++) {
+        if (elems[i].checked) {
+            videoTypes.push(elems[i].getAttribute('data-filter'));
+        }
+    }
+    userSettings.setFilter(settingsKey + '-filter-VideoTypes', videoTypes.join(','));
+
+    // Series status
+    var seriesStatuses = [];
+    elems = context.querySelectorAll('.chkSeriesStatus');
+
+    for (let i = 0, length = elems.length; i < length; i++) {
+        if (elems[i].checked) {
+            seriesStatuses.push(elems[i].getAttribute('data-filter'));
+        }
+    }
+
+    // Genres
+    var genres = [];
+    elems = context.querySelectorAll('.chkGenreFilter');
+
+    for (let i = 0, length = elems.length; i < length; i++) {
+        if (elems[i].checked) {
+            genres.push(elems[i].getAttribute('data-filter'));
+        }
+    }
+    userSettings.setFilter(settingsKey + '-filter-GenreIds', genres.join(','));
+}
+function bindCheckboxInput(context, on) {
+    var elems = context.querySelectorAll('.checkboxList-verticalwrap');
+    for (let i = 0, length = elems.length; i < length; i++) {
+        if (on) {
+            inputManager.on(elems[i], onInputCommand);
+        } else {
+            inputManager.off(elems[i], onInputCommand);
+        }
+    }
+}
+function initEditor(context, settings) {
     context.querySelector('form').addEventListener('submit', onSubmit);
 
     var elems = context.querySelectorAll('.simpleFilter');
@@ -96,128 +192,29 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
     } else {
         context.querySelector('.featureSection').classList.add('hide');
     }
-    }
+}
+function loadDynamicFilters(context, options) {
+    var apiClient = connectionManager.getApiClient(options.serverId);
 
-    function saveValues(context, settings, settingsKey) {
+    var filterMenuOptions = Object.assign(options.filterMenuOptions, {
-        var elems = context.querySelectorAll('.simpleFilter');
-        var i;
-        var length;
-        for (i = 0, length = elems.length; i < length; i++) {
-            if (elems[i].tagName === 'INPUT') {
-                setBasicFilter(context, settingsKey + '-filter-' + elems[i].getAttribute('data-settingname'), elems[i]);
-            } else {
-                setBasicFilter(context, settingsKey + '-filter-' + elems[i].getAttribute('data-settingname'), elems[i].querySelector('input'));
-            }
-        }
 
-        // Video type
+        UserId: apiClient.getCurrentUserId(),
-        var videoTypes = [];
+        ParentId: options.parentId,
-        elems = context.querySelectorAll('.chkVideoTypeFilter');
+        IncludeItemTypes: options.itemTypes.join(',')
-
-        for (i = 0, length = elems.length; i < length; i++) {
-            if (elems[i].checked) {
-                videoTypes.push(elems[i].getAttribute('data-filter'));
-            }
-        }
-        userSettings.setFilter(settingsKey + '-filter-VideoTypes', videoTypes.join(','));
-
-        // Series status
-        var seriesStatuses = [];
-        elems = context.querySelectorAll('.chkSeriesStatus');
-
-        for (i = 0, length = elems.length; i < length; i++) {
-            if (elems[i].checked) {
-                seriesStatuses.push(elems[i].getAttribute('data-filter'));
-            }
-        }
-
-        // Genres
-        var genres = [];
-        elems = context.querySelectorAll('.chkGenreFilter');
-
-        for (i = 0, length = elems.length; i < length; i++) {
-            if (elems[i].checked) {
-                genres.push(elems[i].getAttribute('data-filter'));
-            }
-        }
-        userSettings.setFilter(settingsKey + '-filter-GenreIds', genres.join(','));
-    }
-
-    function setBasicFilter(context, key, elem) {
-        var value = elem.checked;
-        value = value ? value : null;
-        userSettings.setFilter(key, value);
-    }
-
-    function centerFocus(elem, horiz, on) {
-        require(['scrollHelper'], function (scrollHelper) {
-            scrollHelper = scrollHelper.default || scrollHelper;
-            var fn = on ? 'on' : 'off';
-            scrollHelper.centerFocus[fn](elem, horiz);
     });
-    }
 
-    function moveCheckboxFocus(elem, offset) {
+    apiClient.getFilters(filterMenuOptions).then((result) => {
-        var parent = dom.parentWithClass(elem, 'checkboxList-verticalwrap');
+        renderDynamicFilters(context, result, options);
-        var elems = focusManager.getFocusableElements(parent);
+    });
-
+}
-        var index = -1;
+class FilterMenu {
-        for (var i = 0, length = elems.length; i < length; i++) {
+    show(options) {
-            if (elems[i] === elem) {
+        return new Promise( (resolve, reject) => {
-                index = i;
+            import('text!./filtermenu.template.html').then(({ default: template }) => {
-                break;
-            }
-        }
-
-        index += offset;
-
-        index = Math.min(elems.length - 1, index);
-        index = Math.max(0, index);
-
-        var newElem = elems[index];
-        if (newElem) {
-            focusManager.focus(newElem);
-        }
-    }
-
-    function onInputCommand(e) {
-        switch (e.detail.command) {
-            case 'left':
-                moveCheckboxFocus(e.target, -1);
-                e.preventDefault();
-                break;
-            case 'right':
-                moveCheckboxFocus(e.target, 1);
-                e.preventDefault();
-                break;
-            default:
-                break;
-        }
-    }
-
-    function FilterMenu() {
-
-    }
-
-    function bindCheckboxInput(context, on) {
-        var elems = context.querySelectorAll('.checkboxList-verticalwrap');
-        for (var i = 0, length = elems.length; i < length; i++) {
-            if (on) {
-                inputManager.on(elems[i], onInputCommand);
-            } else {
-                inputManager.off(elems[i], onInputCommand);
-            }
-        }
-    }
-
-    FilterMenu.prototype.show = function (options) {
-        return new Promise(function (resolve, reject) {
-            require(['text!./filtermenu.template.html'], function (template) {
                 var dialogOptions = {
                     removeOnClose: true,
                     scrollY: false
                 };
-
                 if (layoutManager.tv) {
                     dialogOptions.size = 'fullscreen';
                 } else {
@@ -241,7 +238,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
                 dlg.innerHTML = globalize.translateHtml(html, 'core');
 
                 var settingElements = dlg.querySelectorAll('.viewSetting');
-                for (var i = 0, length = settingElements.length; i < length; i++) {
+                for (let i = 0, length = settingElements.length; i < length; i++) {
                     if (options.visibleSettings.indexOf(settingElements[i].getAttribute('data-settingname')) === -1) {
                         settingElements[i].classList.add('hide');
                     } else {
@@ -253,7 +250,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
                 loadDynamicFilters(dlg, options);
 
                 bindCheckboxInput(dlg, true);
-
                 dlg.querySelector('.btnCancel').addEventListener('click', function () {
                     dialogHelper.close(dlg);
                 });
@@ -268,7 +264,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
                     submitted = true;
                 }, true);
 
-                dialogHelper.open(dlg).then(function () {
+                dialogHelper.open(dlg).then( function() {
                     bindCheckboxInput(dlg, false);
 
                     if (layoutManager.tv) {
@@ -278,16 +274,14 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
                     if (submitted) {
                         //if (!options.onChange) {
                         saveValues(dlg, options.settings, options.settingsKey);
-                        resolve();
+                        return resolve();
                         //}
-                        return;
                     }
+                    return resolve();
+                });
+            });
+        });
+    }
+}
 
-                    reject();
+export default FilterMenu;
-                });
-            });
-        });
-    };
-
-    return FilterMenu;
-});

src/components/guide/guide-settings.js

@@ -1,16 +1,21 @@
-define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectionManager', 'require', 'loading', 'scrollHelper', 'emby-checkbox', 'emby-radio', 'css!./../formdialog', 'material-icons'], function (dialogHelper, globalize, userSettings, layoutManager, connectionManager, require, loading, scrollHelper) {
+import dialogHelper from 'dialogHelper';
-    'use strict';
+import globalize from 'globalize';
+import * as userSettings from 'userSettings';
+import layoutManager from 'layoutManager';
+import scrollHelper from 'scrollHelper';
+import 'emby-checkbox';
+import 'emby-radio';
+import 'css!./../formdialog';
+import 'material-icons';
 
-    scrollHelper = scrollHelper.default || scrollHelper;
+function saveCategories(context, options) {
+    const categories = [];
 
-    function saveCategories(context, options) {
+    const chkCategorys = context.querySelectorAll('.chkCategory');
-        var categories = [];
+    for (const chkCategory of chkCategorys) {
+        const type = chkCategory.getAttribute('data-type');
 
-        var chkCategorys = context.querySelectorAll('.chkCategory');
+        if (chkCategory.checked) {
-        for (var i = 0, length = chkCategorys.length; i < length; i++) {
-            var type = chkCategorys[i].getAttribute('data-type');
-
-            if (chkCategorys[i].checked) {
             categories.push(type);
         }
     }
@@ -22,73 +27,69 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
     // differentiate between none and all
     categories.push('all');
     options.categories = categories;
+}
+
+function loadCategories(context, options) {
+    const selectedCategories = options.categories || [];
+
+    const chkCategorys = context.querySelectorAll('.chkCategory');
+    for (const chkCategory of chkCategorys) {
+        const type = chkCategory.getAttribute('data-type');
+
+        chkCategory.checked = !selectedCategories.length || selectedCategories.indexOf(type) !== -1;
     }
+}
 
-    function loadCategories(context, options) {
+function save(context) {
-        var selectedCategories = options.categories || [];
+    const chkIndicators = context.querySelectorAll('.chkIndicator');
 
-        var chkCategorys = context.querySelectorAll('.chkCategory');
+    for (const chkIndicator of chkIndicators) {
-        for (var i = 0, length = chkCategorys.length; i < length; i++) {
+        const type = chkIndicator.getAttribute('data-type');
-            var type = chkCategorys[i].getAttribute('data-type');
+        userSettings.set('guide-indicator-' + type, chkIndicator.checked);
-
-            chkCategorys[i].checked = !selectedCategories.length || selectedCategories.indexOf(type) !== -1;
-        }
-    }
-
-    function save(context) {
-        var i;
-        var length;
-
-        var chkIndicators = context.querySelectorAll('.chkIndicator');
-        for (i = 0, length = chkIndicators.length; i < length; i++) {
-            var type = chkIndicators[i].getAttribute('data-type');
-            userSettings.set('guide-indicator-' + type, chkIndicators[i].checked);
     }
 
     userSettings.set('guide-colorcodedbackgrounds', context.querySelector('.chkColorCodedBackgrounds').checked);
     userSettings.set('livetv-favoritechannelsattop', context.querySelector('.chkFavoriteChannelsAtTop').checked);
 
-        var sortBys = context.querySelectorAll('.chkSortOrder');
+    const sortBys = context.querySelectorAll('.chkSortOrder');
-        for (i = 0, length = sortBys.length; i < length; i++) {
+    for (const sortBy of sortBys) {
-            if (sortBys[i].checked) {
+        if (sortBy.checked) {
-                userSettings.set('livetv-channelorder', sortBys[i].value);
+            userSettings.set('livetv-channelorder', sortBy.value);
             break;
         }
     }
-    }
+}
 
-    function load(context) {
+function load(context) {
-        var i;
+    const chkIndicators = context.querySelectorAll('.chkIndicator');
-        var length;
 
-        var chkIndicators = context.querySelectorAll('.chkIndicator');
+    for (const chkIndicator of chkIndicators) {
-        for (i = 0, length = chkIndicators.length; i < length; i++) {
+        const type = chkIndicator.getAttribute('data-type');
-            var type = chkIndicators[i].getAttribute('data-type');
 
-            if (chkIndicators[i].getAttribute('data-default') === 'true') {
+        if (chkIndicator.getAttribute('data-default') === 'true') {
-                chkIndicators[i].checked = userSettings.get('guide-indicator-' + type) !== 'false';
+            chkIndicator.checked = userSettings.get('guide-indicator-' + type) !== 'false';
         } else {
-                chkIndicators[i].checked = userSettings.get('guide-indicator-' + type) === 'true';
+            chkIndicator.checked = userSettings.get('guide-indicator-' + type) === 'true';
         }
     }
 
     context.querySelector('.chkColorCodedBackgrounds').checked = userSettings.get('guide-colorcodedbackgrounds') === 'true';
     context.querySelector('.chkFavoriteChannelsAtTop').checked = userSettings.get('livetv-favoritechannelsattop') !== 'false';
 
-        var sortByValue = userSettings.get('livetv-channelorder') || 'Number';
+    const sortByValue = userSettings.get('livetv-channelorder') || 'Number';
 
-        var sortBys = context.querySelectorAll('.chkSortOrder');
+    const sortBys = context.querySelectorAll('.chkSortOrder');
-        for (i = 0, length = sortBys.length; i < length; i++) {
+    for (const sortBy of sortBys) {
-            sortBys[i].checked = sortBys[i].value === sortByValue;
+        sortBy.checked = sortBy.value === sortByValue;
-        }
     }
+}
 
-    function showEditor(options) {
+function showEditor(options) {
     return new Promise(function (resolve, reject) {
-            var settingsChanged = false;
+        let settingsChanged = false;
 
-            require(['text!./guide-settings.template.html'], function (template) {
+        import('text!./guide-settings.template.html').then(({ default: template }) => {
-                var dialogOptions = {
+            const dialogOptions = {
                 removeOnClose: true,
                 scrollY: false
             };
@@ -99,11 +100,11 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
                 dialogOptions.size = 'small';
             }
 
-                var dlg = dialogHelper.createDialog(dialogOptions);
+            const dlg = dialogHelper.createDialog(dialogOptions);
 
             dlg.classList.add('formDialog');
 
-                var html = '';
+            let html = '';
 
             html += globalize.translateHtml(template, 'core');
 
@@ -141,9 +142,8 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
             dialogHelper.open(dlg);
         });
     });
-    }
+}
 
-    return {
+export default {
     show: showEditor
-    };
+};
-});

src/components/guide/guide-settings.template.html

@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" title="${LabelPrevious}" tabindex="-1">
+    <button is="paper-icon-button-light" class="btnCancel autoSize" title="${Previous}" tabindex="-1">
         <span class="material-icons arrow_back" aria-hidden="true"></span>
     </button>
     <h3 class="formDialogHeaderTitle">

src/components/guide/guide.js

@@ -1,46 +1,64 @@
-define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', 'scrollHelper', 'serverNotifications', 'loading', 'datetime', 'focusManager', 'playbackManager', 'userSettings', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'dom', 'css!./guide.css', 'programStyles', 'material-icons', 'scrollStyles', 'emby-programcell', 'emby-button', 'paper-icon-button-light', 'emby-tabs', 'emby-scroller', 'flexStyles', 'webcomponents'], function (require, inputManager, browser, globalize, connectionManager, scrollHelper, serverNotifications, loading, datetime, focusManager, playbackManager, userSettings, imageLoader, events, layoutManager, itemShortcuts, dom) {
+import inputManager from 'inputManager';
-    'use strict';
+import browser from 'browser';
+import globalize from 'globalize';
+import connectionManager from 'connectionManager';
+import scrollHelper from 'scrollHelper';
+import serverNotifications from 'serverNotifications';
+import loading from 'loading';
+import datetime from 'datetime';
+import focusManager from 'focusManager';
+import playbackManager from 'playbackManager';
+import * as userSettings from 'userSettings';
+import imageLoader from 'imageLoader';
+import events from 'events';
+import layoutManager from 'layoutManager';
+import itemShortcuts from 'itemShortcuts';
+import dom from 'dom';
+import 'css!./guide.css';
+import 'programStyles';
+import 'material-icons';
+import 'scrollStyles';
+import 'emby-programcell';
+import 'emby-button';
+import 'paper-icon-button-light';
+import 'emby-tabs';
+import 'emby-scroller';
+import 'flexStyles';
+import 'webcomponents';
 
-    playbackManager = playbackManager.default || playbackManager;
+function showViewSettings(instance) {
-    browser = browser.default || browser;
+    import('guide-settings-dialog').then(({default: guideSettingsDialog}) => {
-    loading = loading.default || loading;
-    focusManager = focusManager.default || focusManager;
-    scrollHelper = scrollHelper.default || scrollHelper;
-    serverNotifications = serverNotifications.default || serverNotifications;
-
-    function showViewSettings(instance) {
-        require(['guide-settings-dialog'], function (guideSettingsDialog) {
         guideSettingsDialog.show(instance.categoryOptions).then(function () {
             instance.refresh();
         });
     });
-    }
+}
 
-    function updateProgramCellOnScroll(cell, scrollPct) {
+function updateProgramCellOnScroll(cell, scrollPct) {
-        var left = cell.posLeft;
+    let left = cell.posLeft;
     if (!left) {
         left = parseFloat(cell.style.left.replace('%', ''));
         cell.posLeft = left;
     }
-        var width = cell.posWidth;
+    let width = cell.posWidth;
     if (!width) {
         width = parseFloat(cell.style.width.replace('%', ''));
         cell.posWidth = width;
     }
 
-        var right = left + width;
+    const right = left + width;
-        var newPct = Math.max(Math.min(scrollPct, right), left);
+    const newPct = Math.max(Math.min(scrollPct, right), left);
 
-        var offset = newPct - left;
+    const offset = newPct - left;
-        var pctOfWidth = (offset / width) * 100;
+    const pctOfWidth = (offset / width) * 100;
 
-        var guideProgramName = cell.guideProgramName;
+    let guideProgramName = cell.guideProgramName;
     if (!guideProgramName) {
         guideProgramName = cell.querySelector('.guideProgramName');
         cell.guideProgramName = guideProgramName;
     }
 
-        var caret = cell.caret;
+    let caret = cell.caret;
     if (!caret) {
         caret = cell.querySelector('.guide-programNameCaret');
         cell.caret = caret;
@@ -55,10 +73,10 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             caret.classList.add('hide');
         }
     }
-    }
+}
 
-    var isUpdatingProgramCellScroll = false;
+let isUpdatingProgramCellScroll = false;
-    function updateProgramCellsOnScroll(programGrid, programCells) {
+function updateProgramCellsOnScroll(programGrid, programCells) {
     if (isUpdatingProgramCellScroll) {
         return;
     }
@@ -66,34 +84,34 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     isUpdatingProgramCellScroll = true;
 
     requestAnimationFrame(function () {
-            var scrollLeft = programGrid.scrollLeft;
+        const scrollLeft = programGrid.scrollLeft;
 
-            var scrollPct = scrollLeft ? (scrollLeft / programGrid.scrollWidth) * 100 : 0;
+        const scrollPct = scrollLeft ? (scrollLeft / programGrid.scrollWidth) * 100 : 0;
 
-            for (var i = 0, length = programCells.length; i < length; i++) {
+        for (const programCell of programCells) {
-                updateProgramCellOnScroll(programCells[i], scrollPct);
+            updateProgramCellOnScroll(programCell, scrollPct);
         }
 
         isUpdatingProgramCellScroll = false;
     });
-    }
+}
 
-    function onProgramGridClick(e) {
+function onProgramGridClick(e) {
     if (!layoutManager.tv) {
         return;
     }
 
-        var programCell = dom.parentWithClass(e.target, 'programCell');
+    const programCell = dom.parentWithClass(e.target, 'programCell');
     if (programCell) {
-            var startDate = programCell.getAttribute('data-startdate');
+        let startDate = programCell.getAttribute('data-startdate');
-            var endDate = programCell.getAttribute('data-enddate');
+        let endDate = programCell.getAttribute('data-enddate');
         startDate = datetime.parseISO8601Date(startDate, { toLocal: true }).getTime();
         endDate = datetime.parseISO8601Date(endDate, { toLocal: true }).getTime();
 
-            var now = new Date().getTime();
+        const now = new Date().getTime();
         if (now >= startDate && now < endDate) {
-                var channelId = programCell.getAttribute('data-channelid');
+            const channelId = programCell.getAttribute('data-channelid');
-                var serverId = programCell.getAttribute('data-serverid');
+            const serverId = programCell.getAttribute('data-serverid');
 
             e.preventDefault();
             e.stopPropagation();
@@ -104,27 +122,27 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             });
         }
     }
-    }
+}
 
-    function Guide(options) {
+function Guide(options) {
-        var self = this;
+    const self = this;
-        var items = {};
+    let items = {};
 
     self.options = options;
     self.categoryOptions = { categories: [] };
 
     // 30 mins
-        var cellCurationMinutes = 30;
+    const cellCurationMinutes = 30;
-        var cellDurationMs = cellCurationMinutes * 60 * 1000;
+    const cellDurationMs = cellCurationMinutes * 60 * 1000;
-        var msPerDay = 86400000;
+    const msPerDay = 86400000;
 
-        var currentDate;
+    let currentDate;
-        var currentStartIndex = 0;
+    let currentStartIndex = 0;
-        var currentChannelLimit = 0;
+    let currentChannelLimit = 0;
-        var autoRefreshInterval;
+    let autoRefreshInterval;
-        var programCells;
+    let programCells;
-        var lastFocusDirection;
+    let lastFocusDirection;
-        var programGrid;
+    let programGrid;
 
     self.refresh = function () {
         currentDate = null;
@@ -160,7 +178,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     function restartAutoRefresh() {
         stopAutoRefresh();
 
-            var intervalMs = 60000 * 15; // (minutes)
+        const intervalMs = 60000 * 15; // (minutes)
 
         autoRefreshInterval = setInterval(function () {
             self.refresh();
@@ -175,7 +193,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function normalizeDateToTimeslot(date) {
-            var minutesOffset = date.getMinutes() - cellCurationMinutes;
+        const minutesOffset = date.getMinutes() - cellCurationMinutes;
 
         if (minutesOffset >= 0) {
             date.setHours(date.getHours(), cellCurationMinutes, 0, 0);
@@ -195,9 +213,9 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function reloadGuide(context, newStartDate, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender) {
-            var apiClient = connectionManager.getApiClient(options.serverId);
+        const apiClient = connectionManager.getApiClient(options.serverId);
 
-            var channelQuery = {
+        const channelQuery = {
 
             StartIndex: 0,
             EnableFavoriteSorting: userSettings.get('livetv-favoritechannelsattop') !== 'false'
@@ -205,7 +223,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
         channelQuery.UserId = apiClient.getCurrentUserId();
 
-            var channelLimit = 500;
+        const channelLimit = 500;
         currentChannelLimit = channelLimit;
 
         showLoading();
@@ -216,12 +234,12 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         channelQuery.EnableUserData = false;
         channelQuery.EnableImageTypes = 'Primary';
 
-            var categories = self.categoryOptions.categories || [];
+        const categories = self.categoryOptions.categories || [];
-            var displayMovieContent = !categories.length || categories.indexOf('movies') !== -1;
+        const displayMovieContent = !categories.length || categories.indexOf('movies') !== -1;
-            var displaySportsContent = !categories.length || categories.indexOf('sports') !== -1;
+        const displaySportsContent = !categories.length || categories.indexOf('sports') !== -1;
-            var displayNewsContent = !categories.length || categories.indexOf('news') !== -1;
+        const displayNewsContent = !categories.length || categories.indexOf('news') !== -1;
-            var displayKidsContent = !categories.length || categories.indexOf('kids') !== -1;
+        const displayKidsContent = !categories.length || categories.indexOf('kids') !== -1;
-            var displaySeriesContent = !categories.length || categories.indexOf('series') !== -1;
+        const displaySeriesContent = !categories.length || categories.indexOf('series') !== -1;
 
         if (displayMovieContent && displaySportsContent && displayNewsContent && displayKidsContent) {
             channelQuery.IsMovie = null;
@@ -255,19 +273,19 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             channelQuery.SortOrder = null;
         }
 
-            var date = newStartDate;
+        let date = newStartDate;
         // Add one second to avoid getting programs that are just ending
         date = new Date(date.getTime() + 1000);
 
         // Subtract to avoid getting programs that are starting when the grid ends
-            var nextDay = new Date(date.getTime() + msPerDay - 2000);
+        const nextDay = new Date(date.getTime() + msPerDay - 2000);
 
         // Normally we'd want to just let responsive css handle this,
         // but since mobile browsers are often underpowered,
         // it can help performance to get them out of the markup
-            var allowIndicators = dom.getWindowSize().innerWidth >= 600;
+        const allowIndicators = dom.getWindowSize().innerWidth >= 600;
 
-            var renderOptions = {
+        const renderOptions = {
             showHdIcon: allowIndicators && userSettings.get('guide-indicator-hd') === 'true',
             showLiveIndicator: allowIndicators && userSettings.get('guide-indicator-live') !== 'false',
             showPremiereIndicator: allowIndicators && userSettings.get('guide-indicator-premiere') !== 'false',
@@ -277,8 +295,8 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         };
 
         apiClient.getLiveTvChannels(channelQuery).then(function (channelsResult) {
-                var btnPreviousPage = context.querySelector('.btnPreviousPage');
+            const btnPreviousPage = context.querySelector('.btnPreviousPage');
-                var btnNextPage = context.querySelector('.btnNextPage');
+            const btnNextPage = context.querySelector('.btnNextPage');
 
             if (channelsResult.TotalRecordCount > channelLimit) {
                 context.querySelector('.guideOptions').classList.remove('hide');
@@ -301,9 +319,9 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                 context.querySelector('.guideOptions').classList.add('hide');
             }
 
-                var programFields = [];
+            const programFields = [];
 
-                var programQuery = {
+            const programQuery = {
                 UserId: apiClient.getCurrentUserId(),
                 MaxStartDate: nextDay.toISOString(),
                 MinEndDate: date.toISOString(),
@@ -347,7 +365,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function getTimeslotHeadersHtml(startDate, endDateTime) {
-            var html = '';
+        let html = '';
 
         // clone
         startDate = new Date(startDate.getTime());
@@ -388,7 +406,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function getTimerIndicator(item) {
-            var status;
+        let status;
 
         if (item.Type === 'SeriesTimer') {
             return '<span class="material-icons programIcon seriesTimerIcon fiber_smart_record"></span>';
@@ -412,30 +430,30 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function getChannelProgramsHtml(context, date, channel, programs, options, listInfo) {
-            var html = '';
+        let html = '';
 
-            var startMs = date.getTime();
+        const startMs = date.getTime();
-            var endMs = startMs + msPerDay - 1;
+        const endMs = startMs + msPerDay - 1;
 
-            var outerCssClass = layoutManager.tv ? 'channelPrograms channelPrograms-tv' : 'channelPrograms';
+        const outerCssClass = layoutManager.tv ? 'channelPrograms channelPrograms-tv' : 'channelPrograms';
 
         html += '<div class="' + outerCssClass + '" data-channelid="' + channel.Id + '">';
 
-            var clickAction = layoutManager.tv ? 'link' : 'programdialog';
+        const clickAction = layoutManager.tv ? 'link' : 'programdialog';
 
-            var categories = self.categoryOptions.categories || [];
+        const categories = self.categoryOptions.categories || [];
-            var displayMovieContent = !categories.length || categories.indexOf('movies') !== -1;
+        const displayMovieContent = !categories.length || categories.indexOf('movies') !== -1;
-            var displaySportsContent = !categories.length || categories.indexOf('sports') !== -1;
+        const displaySportsContent = !categories.length || categories.indexOf('sports') !== -1;
-            var displayNewsContent = !categories.length || categories.indexOf('news') !== -1;
+        const displayNewsContent = !categories.length || categories.indexOf('news') !== -1;
-            var displayKidsContent = !categories.length || categories.indexOf('kids') !== -1;
+        const displayKidsContent = !categories.length || categories.indexOf('kids') !== -1;
-            var displaySeriesContent = !categories.length || categories.indexOf('series') !== -1;
+        const displaySeriesContent = !categories.length || categories.indexOf('series') !== -1;
-            var enableColorCodedBackgrounds = userSettings.get('guide-colorcodedbackgrounds') === 'true';
+        const enableColorCodedBackgrounds = userSettings.get('guide-colorcodedbackgrounds') === 'true';
 
-            var programsFound;
+        let programsFound;
-            var now = new Date().getTime();
+        const now = new Date().getTime();
 
-            for (var i = listInfo.startIndex, length = programs.length; i < length; i++) {
+        for (let i = listInfo.startIndex, length = programs.length; i < length; i++) {
-                var program = programs[i];
+            const program = programs[i];
 
             if (program.ChannelId !== channel.Id) {
                 if (programsFound) {
@@ -450,8 +468,8 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
             parseDates(program);
 
-                var startDateLocalMs = program.StartDateLocal.getTime();
+            const startDateLocalMs = program.StartDateLocal.getTime();
-                var endDateLocalMs = program.EndDateLocal.getTime();
+            const endDateLocalMs = program.EndDateLocal.getTime();
 
             if (endDateLocalMs < startMs) {
                 continue;
@@ -463,18 +481,18 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
             items[program.Id] = program;
 
-                var renderStartMs = Math.max(startDateLocalMs, startMs);
+            const renderStartMs = Math.max(startDateLocalMs, startMs);
-                var startPercent = (startDateLocalMs - startMs) / msPerDay;
+            let startPercent = (startDateLocalMs - startMs) / msPerDay;
             startPercent *= 100;
             startPercent = Math.max(startPercent, 0);
 
-                var renderEndMs = Math.min(endDateLocalMs, endMs);
+            const renderEndMs = Math.min(endDateLocalMs, endMs);
-                var endPercent = (renderEndMs - renderStartMs) / msPerDay;
+            let endPercent = (renderEndMs - renderStartMs) / msPerDay;
             endPercent *= 100;
 
-                var cssClass = 'programCell itemAction';
+            let cssClass = 'programCell itemAction';
-                var accentCssClass = null;
+            let accentCssClass = null;
-                var displayInnerContent = true;
+            let displayInnerContent = true;
 
             if (program.IsKids) {
                 displayInnerContent = displayKidsContent;
@@ -502,7 +520,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                 cssClass += ' programCell-active';
             }
 
-                var timerAttributes = '';
+            let timerAttributes = '';
             if (program.TimerId) {
                 timerAttributes += ' data-timerid="' + program.TimerId + '"';
             }
@@ -510,12 +528,12 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                 timerAttributes += ' data-seriestimerid="' + program.SeriesTimerId + '"';
             }
 
-                var isAttribute = endPercent >= 2 ? ' is="emby-programcell"' : '';
+            const isAttribute = endPercent >= 2 ? ' is="emby-programcell"' : '';
 
             html += '<button' + isAttribute + ' data-action="' + clickAction + '"' + timerAttributes + ' data-channelid="' + program.ChannelId + '" data-id="' + program.Id + '" data-serverid="' + program.ServerId + '" data-startdate="' + program.StartDate + '" data-enddate="' + program.EndDate + '" data-type="' + program.Type + '" class="' + cssClass + '" style="left:' + startPercent + '%;width:' + endPercent + '%;">';
 
             if (displayInnerContent) {
-                    var guideProgramNameClass = 'guideProgramName';
+                const guideProgramNameClass = 'guideProgramName';
 
                 html += '<div class="' + guideProgramNameClass + '">';
 
@@ -523,13 +541,13 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
                 html += '<div class="guideProgramNameText">' + program.Name;
 
-                    var indicatorHtml = null;
+                let indicatorHtml = null;
                 if (program.IsLive && options.showLiveIndicator) {
                     indicatorHtml = '<span class="liveTvProgram guideProgramIndicator">' + globalize.translate('Live') + '</span>';
                 } else if (program.IsPremiere && options.showPremiereIndicator) {
                     indicatorHtml = '<span class="premiereTvProgram guideProgramIndicator">' + globalize.translate('Premiere') + '</span>';
                 } else if (program.IsSeries && !program.IsRepeat && options.showNewIndicator) {
-                        indicatorHtml = '<span class="newTvProgram guideProgramIndicator">' + globalize.translate('AttributeNew') + '</span>';
+                    indicatorHtml = '<span class="newTvProgram guideProgramIndicator">' + globalize.translate('New') + '</span>';
                 } else if (program.IsSeries && program.IsRepeat && options.showRepeatIndicator) {
                     indicatorHtml = '<span class="repeatTvProgram guideProgramIndicator">' + globalize.translate('Repeat') + '</span>';
                 }
@@ -568,19 +586,18 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function renderChannelHeaders(context, channels, apiClient) {
-            var html = '';
+        let html = '';
 
-            for (var i = 0, length = channels.length; i < length; i++) {
+        for (const channel of channels) {
-                var channel = channels[i];
+            const hasChannelImage = channel.ImageTags.Primary;
-                var hasChannelImage = channel.ImageTags.Primary;
 
-                var cssClass = 'guide-channelHeaderCell itemAction';
+            let cssClass = 'guide-channelHeaderCell itemAction';
 
             if (layoutManager.tv) {
                 cssClass += ' guide-channelHeaderCell-tv';
             }
 
-                var title = [];
+            const title = [];
             if (channel.ChannelNumber) {
                 title.push(channel.ChannelNumber);
             }
@@ -591,7 +608,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             html += '<button title="' + title.join(' ') + '" type="button" class="' + cssClass + '"' + ' data-action="link" data-isfolder="' + channel.IsFolder + '" data-id="' + channel.Id + '" data-serverid="' + channel.ServerId + '" data-type="' + channel.Type + '">';
 
             if (hasChannelImage) {
-                    var url = apiClient.getScaledImageUrl(channel.Id, {
+                const url = apiClient.getScaledImageUrl(channel.Id, {
                     maxHeight: 220,
                     tag: channel.ImageTags.Primary,
                     type: 'Primary'
@@ -611,20 +628,20 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             html += '</button>';
         }
 
-            var channelList = context.querySelector('.channelsContainer');
+        const channelList = context.querySelector('.channelsContainer');
         channelList.innerHTML = html;
         imageLoader.lazyChildren(channelList);
     }
 
     function renderPrograms(context, date, channels, programs, options) {
-            var listInfo = {
+        const listInfo = {
             startIndex: 0
         };
 
-            var html = [];
+        const html = [];
 
-            for (var i = 0, length = channels.length; i < length; i++) {
+        for (const channel of channels) {
-                html.push(getChannelProgramsHtml(context, date, channels[i], programs, options, listInfo));
+            html.push(getChannelProgramsHtml(context, date, channel, programs, options, listInfo));
         }
 
         programGrid.innerHTML = html.join('');
@@ -635,17 +652,17 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function getProgramSortOrder(program, channels) {
-            var channelId = program.ChannelId;
+        const channelId = program.ChannelId;
-            var channelIndex = -1;
+        let channelIndex = -1;
 
-            for (var i = 0, length = channels.length; i < length; i++) {
+        for (let i = 0, length = channels.length; i < length; i++) {
             if (channelId === channels[i].Id) {
                 channelIndex = i;
                 break;
             }
         }
 
-            var start = datetime.parseISO8601Date(program.StartDate, { toLocal: true });
+        const start = datetime.parseISO8601Date(program.StartDate, { toLocal: true });
 
         return (channelIndex * 10000000) + (start.getTime() / 60000);
     }
@@ -655,9 +672,9 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             return getProgramSortOrder(a, channels) - getProgramSortOrder(b, channels);
         });
 
-            var activeElement = document.activeElement;
+        const activeElement = document.activeElement;
-            var itemId = activeElement && activeElement.getAttribute ? activeElement.getAttribute('data-id') : null;
+        const itemId = activeElement && activeElement.getAttribute ? activeElement.getAttribute('data-id') : null;
-            var channelRowId = null;
+        let channelRowId = null;
 
         if (activeElement) {
             channelRowId = dom.parentWithClass(activeElement, 'channelPrograms');
@@ -666,8 +683,8 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
         renderChannelHeaders(context, channels, apiClient);
 
-            var startDate = date;
+        const startDate = date;
-            var endDate = new Date(startDate.getTime() + msPerDay);
+        const endDate = new Date(startDate.getTime() + msPerDay);
         context.querySelector('.timeslotHeaders').innerHTML = getTimeslotHeadersHtml(startDate, endDate);
         items = {};
         renderPrograms(context, date, channels, programs, renderOptions);
@@ -682,17 +699,17 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     function scrollProgramGridToTimeMs(context, scrollToTimeMs, startTimeOfDayMs) {
         scrollToTimeMs -= startTimeOfDayMs;
 
-            var pct = scrollToTimeMs / msPerDay;
+        const pct = scrollToTimeMs / msPerDay;
 
         programGrid.scrollTop = 0;
 
-            var scrollPos = pct * programGrid.scrollWidth;
+        const scrollPos = pct * programGrid.scrollWidth;
 
         nativeScrollTo(programGrid, scrollPos, true);
     }
 
     function focusProgram(context, itemId, channelRowId, focusToTimeMs, startTimeOfDayMs) {
-            var focusElem;
+        let focusElem;
         if (itemId) {
             focusElem = context.querySelector('[data-id="' + itemId + '"]');
         }
@@ -700,7 +717,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         if (focusElem) {
             focusManager.focus(focusElem);
         } else {
-                var autoFocusParent;
+            let autoFocusParent;
 
             if (channelRowId) {
                 autoFocusParent = context.querySelector('[data-channelid="' + channelRowId + '"]');
@@ -712,14 +729,14 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
             focusToTimeMs -= startTimeOfDayMs;
 
-                var pct = (focusToTimeMs / msPerDay) * 100;
+            const pct = (focusToTimeMs / msPerDay) * 100;
 
-                var programCell = autoFocusParent.querySelector('.programCell');
+            let programCell = autoFocusParent.querySelector('.programCell');
 
             while (programCell) {
-                    var left = (programCell.style.left || '').replace('%', '');
+                let left = (programCell.style.left || '').replace('%', '');
                 left = left ? parseFloat(left) : 0;
-                    var width = (programCell.style.width || '').replace('%', '');
+                let width = (programCell.style.width || '').replace('%', '');
                 width = width ? parseFloat(width) : 0;
 
                 if (left >= pct || (left + width) >= pct) {
@@ -752,14 +769,14 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
     }
 
-        var lastGridScroll = 0;
+    let lastGridScroll = 0;
-        var lastHeaderScroll = 0;
+    let lastHeaderScroll = 0;
-        var scrollXPct = 0;
+    let scrollXPct = 0;
     function onProgramGridScroll(context, elem, timeslotHeaders) {
         if ((new Date().getTime() - lastHeaderScroll) >= 1000) {
             lastGridScroll = new Date().getTime();
 
-                var scrollLeft = elem.scrollLeft;
+            const scrollLeft = elem.scrollLeft;
             scrollXPct = (scrollLeft * 100) / elem.scrollWidth;
             nativeScrollTo(timeslotHeaders, scrollLeft, true);
         }
@@ -775,17 +792,17 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function changeDate(page, date, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender) {
-            var newStartDate = normalizeDateToTimeslot(date);
+        const newStartDate = normalizeDateToTimeslot(date);
         currentDate = newStartDate;
 
         reloadGuide(page, newStartDate, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender);
     }
 
     function getDateTabText(date, isActive, tabIndex) {
-            var cssClass = isActive ? 'emby-tab-button guide-date-tab-button emby-tab-button-active' : 'emby-tab-button guide-date-tab-button';
+        const cssClass = isActive ? 'emby-tab-button guide-date-tab-button emby-tab-button-active' : 'emby-tab-button guide-date-tab-button';
 
-            var html = '<button is="emby-button" class="' + cssClass + '" data-index="' + tabIndex + '" data-date="' + date.getTime() + '">';
+        let html = '<button is="emby-button" class="' + cssClass + '" data-index="' + tabIndex + '" data-date="' + date.getTime() + '">';
-            var tabText = datetime.toLocaleDateString(date, { weekday: 'short' });
+        let tabText = datetime.toLocaleDateString(date, { weekday: 'short' });
 
         tabText += '<br/>';
         tabText += date.getDate();
@@ -796,12 +813,12 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function setDateRange(page, guideInfo) {
-            var today = new Date();
+        const today = new Date();
-            var nowHours = today.getHours();
+        const nowHours = today.getHours();
         today.setHours(nowHours, 0, 0, 0);
 
-            var start = datetime.parseISO8601Date(guideInfo.StartDate, { toLocal: true });
+        let start = datetime.parseISO8601Date(guideInfo.StartDate, { toLocal: true });
-            var end = datetime.parseISO8601Date(guideInfo.EndDate, { toLocal: true });
+        const end = datetime.parseISO8601Date(guideInfo.EndDate, { toLocal: true });
 
         start.setHours(nowHours, 0, 0, 0);
         end.setHours(0, 0, 0, 0);
@@ -812,11 +829,11 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
         start = new Date(Math.max(today, start));
 
-            var dateTabsHtml = '';
+        let dateTabsHtml = '';
-            var tabIndex = 0;
+        let tabIndex = 0;
 
         // TODO: Use date-fns
-            var date = new Date();
+        const date = new Date();
 
         if (currentDate) {
             date.setTime(currentDate.getTime());
@@ -824,11 +841,11 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
         date.setHours(nowHours, 0, 0, 0);
 
-            var startTimeOfDayMs = (start.getHours() * 60 * 60 * 1000);
+        let startTimeOfDayMs = (start.getHours() * 60 * 60 * 1000);
         startTimeOfDayMs += start.getMinutes() * 60 * 1000;
 
         while (start <= end) {
-                var isActive = date.getDate() === start.getDate() && date.getMonth() === start.getMonth() && date.getFullYear() === start.getFullYear();
+            const isActive = date.getDate() === start.getDate() && date.getMonth() === start.getMonth() && date.getFullYear() === start.getFullYear();
 
             dateTabsHtml += getDateTabText(start, isActive, tabIndex);
 
@@ -840,23 +857,23 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         page.querySelector('.emby-tabs-slider').innerHTML = dateTabsHtml;
         page.querySelector('.guideDateTabs').refresh();
 
-            var newDate = new Date();
+        const newDate = new Date();
-            var newDateHours = newDate.getHours();
+        const newDateHours = newDate.getHours();
-            var scrollToTimeMs = newDateHours * 60 * 60 * 1000;
+        let scrollToTimeMs = newDateHours * 60 * 60 * 1000;
 
-            var minutes = newDate.getMinutes();
+        const minutes = newDate.getMinutes();
         if (minutes >= 30) {
             scrollToTimeMs += 30 * 60 * 1000;
         }
 
-            var focusToTimeMs = ((newDateHours * 60) + minutes) * 60 * 1000;
+        const focusToTimeMs = ((newDateHours * 60) + minutes) * 60 * 1000;
         changeDate(page, date, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, layoutManager.tv);
     }
 
     function reloadPage(page) {
         showLoading();
 
-            var apiClient = connectionManager.getApiClient(options.serverId);
+        const apiClient = connectionManager.getApiClient(options.serverId);
 
         apiClient.getLiveTvGuideInfo().then(function (guideInfo) {
             setDateRange(page, guideInfo);
@@ -864,18 +881,17 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function getChannelProgramsFocusableElements(container) {
-            var elements = container.querySelectorAll('.programCell');
+        const elements = container.querySelectorAll('.programCell');
 
-            var list = [];
+        const list = [];
         // add 1 to avoid programs that are out of view to the left
-            var currentScrollXPct = scrollXPct + 1;
+        const currentScrollXPct = scrollXPct + 1;
 
-            for (var i = 0, length = elements.length; i < length; i++) {
+        for (const elem of elements) {
-                var elem = elements[i];
+            let left = (elem.style.left || '').replace('%', '');
-
-                var left = (elem.style.left || '').replace('%', '');
             left = left ? parseFloat(left) : 0;
-                var width = (elem.style.width || '').replace('%', '');
+
+            let width = (elem.style.width || '').replace('%', '');
             width = width ? parseFloat(width) : 0;
 
             if ((left + width) >= currentScrollXPct) {
@@ -887,12 +903,12 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function onInputCommand(e) {
-            var target = e.target;
+        const target = e.target;
-            var programCell = dom.parentWithClass(target, 'programCell');
+        const programCell = dom.parentWithClass(target, 'programCell');
-            var container;
+        let container;
-            var channelPrograms;
+        let channelPrograms;
-            var focusableElements;
+        let focusableElements;
-            var newRow;
+        let newRow;
 
         switch (e.detail.command) {
             case 'up':
@@ -976,14 +992,14 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function onScrollerFocus(e) {
-            var target = e.target;
+        const target = e.target;
-            var programCell = dom.parentWithClass(target, 'programCell');
+        const programCell = dom.parentWithClass(target, 'programCell');
 
         if (programCell) {
-                var focused = target;
+            const focused = target;
 
-                var id = focused.getAttribute('data-id');
+            const id = focused.getAttribute('data-id');
-                var item = items[id];
+            const item = items[id];
 
             if (item) {
                 events.trigger(self, 'focus', [
@@ -1002,9 +1018,9 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                 scrollHelper.toCenter(programGrid, programCell, true, true);
             }
         } else if (lastFocusDirection === 'up' || lastFocusDirection === 'down') {
-                var verticalScroller = dom.parentWithClass(target, 'guideVerticalScroller');
+            const verticalScroller = dom.parentWithClass(target, 'guideVerticalScroller');
             if (verticalScroller) {
-                    var focusedElement = programCell || dom.parentWithTag(target, 'BUTTON');
+                const focusedElement = programCell || dom.parentWithTag(target, 'BUTTON');
                 verticalScroller.toCenter(focusedElement, true);
             }
         }
@@ -1012,7 +1028,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
     function setScrollEvents(view, enabled) {
         if (layoutManager.tv) {
-                var guideVerticalScroller = view.querySelector('.guideVerticalScroller');
+            const guideVerticalScroller = view.querySelector('.guideVerticalScroller');
 
             if (enabled) {
                 inputManager.on(guideVerticalScroller, onInputCommand);
@@ -1023,16 +1039,14 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function onTimerCreated(e, apiClient, data) {
-            var programId = data.ProgramId;
+        const programId = data.ProgramId;
         // This could be null, not supported by all tv providers
-            var newTimerId = data.Id;
+        const newTimerId = data.Id;
 
         // find guide cells by program id, ensure timer icon
-            var cells = options.element.querySelectorAll('.programCell[data-id="' + programId + '"]');
+        const cells = options.element.querySelectorAll('.programCell[data-id="' + programId + '"]');
-            for (var i = 0, length = cells.length; i < length; i++) {
+        for (const cell of cells) {
-                var cell = cells[i];
+            const icon = cell.querySelector('.timerIcon');
-
-                var icon = cell.querySelector('.timerIcon');
             if (!icon) {
                 cell.querySelector('.guideProgramName').insertAdjacentHTML('beforeend', '<span class="timerIcon material-icons programIcon fiber_manual_record"></span>');
             }
@@ -1047,42 +1061,46 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function onTimerCancelled(e, apiClient, data) {
-            var id = data.Id;
+        const id = data.Id;
         // find guide cells by timer id, remove timer icon
-            var cells = options.element.querySelectorAll('.programCell[data-timerid="' + id + '"]');
+        const cells = options.element.querySelectorAll('.programCell[data-timerid="' + id + '"]');
-            for (var i = 0, length = cells.length; i < length; i++) {
+
-                var cell = cells[i];
+        for (const cell of cells) {
-                var icon = cell.querySelector('.timerIcon');
+            const icon = cell.querySelector('.timerIcon');
+
             if (icon) {
                 icon.parentNode.removeChild(icon);
             }
+
             cell.removeAttribute('data-timerid');
         }
     }
 
     function onSeriesTimerCancelled(e, apiClient, data) {
-            var id = data.Id;
+        const id = data.Id;
         // find guide cells by timer id, remove timer icon
-            var cells = options.element.querySelectorAll('.programCell[data-seriestimerid="' + id + '"]');
+        const cells = options.element.querySelectorAll('.programCell[data-seriestimerid="' + id + '"]');
-            for (var i = 0, length = cells.length; i < length; i++) {
+
-                var cell = cells[i];
+        for (const cell of cells) {
-                var icon = cell.querySelector('.seriesTimerIcon');
+            const icon = cell.querySelector('.seriesTimerIcon');
+
             if (icon) {
                 icon.parentNode.removeChild(icon);
             }
+
             cell.removeAttribute('data-seriestimerid');
         }
     }
 
-        require(['text!./tvguide.template.html'], function (template) {
+    import('text!./tvguide.template.html').then(({default: template}) => {
-            var context = options.element;
+        const context = options.element;
 
         context.classList.add('tvguide');
 
         context.innerHTML = globalize.translateHtml(template, 'core');
 
         programGrid = context.querySelector('.programGrid');
-            var timeslotHeaders = context.querySelector('.timeslotHeaders');
+        const timeslotHeaders = context.querySelector('.timeslotHeaders');
 
         if (layoutManager.tv) {
             dom.addEventListener(context.querySelector('.guideVerticalScroller'), 'focus', onScrollerFocus, {
@@ -1131,17 +1149,17 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         });
 
         context.querySelector('.guideDateTabs').addEventListener('tabchange', function (e) {
-                var allTabButtons = e.target.querySelectorAll('.guide-date-tab-button');
+            const allTabButtons = e.target.querySelectorAll('.guide-date-tab-button');
 
-                var tabButton = allTabButtons[parseInt(e.detail.selectedTabIndex)];
+            const tabButton = allTabButtons[parseInt(e.detail.selectedTabIndex)];
             if (tabButton) {
-                    var previousButton = e.detail.previousIndex == null ? null : allTabButtons[parseInt(e.detail.previousIndex)];
+                const previousButton = e.detail.previousIndex == null ? null : allTabButtons[parseInt(e.detail.previousIndex)];
 
-                    var date = new Date();
+                const date = new Date();
                 date.setTime(parseInt(tabButton.getAttribute('data-date')));
 
-                    var scrollWidth = programGrid.scrollWidth;
+                const scrollWidth = programGrid.scrollWidth;
-                    var scrollToTimeMs;
+                let scrollToTimeMs;
                 if (scrollWidth) {
                     scrollToTimeMs = (programGrid.scrollLeft / scrollWidth) * msPerDay;
                 } else {
@@ -1149,14 +1167,14 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                 }
 
                 if (previousButton) {
-                        var previousDate = new Date();
+                    const previousDate = new Date();
                     previousDate.setTime(parseInt(previousButton.getAttribute('data-date')));
 
                     scrollToTimeMs += (previousDate.getHours() * 60 * 60 * 1000);
                     scrollToTimeMs += (previousDate.getMinutes() * 60 * 1000);
                 }
 
-                    var startTimeOfDayMs = (date.getHours() * 60 * 60 * 1000);
+                let startTimeOfDayMs = (date.getHours() * 60 * 60 * 1000);
                 startTimeOfDayMs += (date.getMinutes() * 60 * 1000);
 
                 changeDate(context, date, scrollToTimeMs, scrollToTimeMs, startTimeOfDayMs, false);
@@ -1175,7 +1193,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
         self.refresh();
     });
-    }
+}
 
-    return Guide;
+export default Guide;
-});

src/components/guide/tvguide.template.html

@@ -29,10 +29,10 @@
 </div>
 
 <div class="guideOptions hide">
-    <button is="paper-icon-button-light" type="button" class="btnPreviousPage" title="${LabelPrevious}">
+    <button is="paper-icon-button-light" type="button" class="btnPreviousPage" title="${Previous}">
         <span class="material-icons arrow_back" aria-hidden="true"></span>
     </button>
-    <button is="paper-icon-button-light" type="button" class="btnNextPage" title="${LabelNext}">
+    <button is="paper-icon-button-light" type="button" class="btnNextPage" title="${Next}">
         <span class="material-icons arrow_forward" aria-hidden="true"></span>
     </button>
 </div>

src/components/homeScreenSettings/homeScreenSettings.template.html

@@ -25,7 +25,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>
@@ -38,7 +38,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>
@@ -51,7 +51,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>
@@ -64,7 +64,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>
@@ -77,7 +77,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>
@@ -90,7 +90,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>
@@ -103,7 +103,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>

src/components/homesections/homesections.js

@@ -696,12 +696,12 @@ import 'css!./homesections';
                 serverId: apiClient.serverId()
             }) + '" class="button-flat button-flat-mini sectionTitleTextButton">';
             html += '<h2 class="sectionTitle sectionTitle-cards">';
-            html += globalize.translate('HeaderNextUp');
+            html += globalize.translate('NextUp');
             html += '</h2>';
             html += '<span class="material-icons chevron_right"></span>';
             html += '</a>';
         } else {
-            html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('HeaderNextUp') + '</h2>';
+            html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('NextUp') + '</h2>';
         }
         html += '</div>';
 

src/components/imageDownloader/imageDownloader.js

@@ -8,7 +8,6 @@ import browser from 'browser';
 import layoutManager from 'layoutManager';
 import scrollHelper from 'scrollHelper';
 import globalize from 'globalize';
-import require from 'require';
 import 'emby-checkbox';
 import 'paper-icon-button-light';
 import 'emby-button';
@@ -317,7 +316,7 @@ import 'cardStyle';
     function showEditor(itemId, serverId, itemType) {
         loading.show();
 
-        require(['text!./imageDownloader.template.html'], function (template) {
+        import('text!./imageDownloader.template.html').then(({default: template}) => {
             const apiClient = connectionManager.getApiClient(serverId);
 
             currentItemId = itemId;

src/components/images/imageLoader.js

@@ -17,8 +17,8 @@ import 'css!./style';
             // Although the default values recommended by Blurhash developers is 32x32, a size of 18x18 seems to be the sweet spot for us,
             // improving the performance and reducing the memory usage, while retaining almost full blur quality.
             // Lower values had more visible pixelation
-            let width = 18;
+            const width = 18;
-            let height = 18;
+            const height = 18;
             let pixels;
             try {
                 pixels = blurhash.decode(blurhashstr, width, height);
@@ -27,11 +27,11 @@ import 'css!./style';
                 target.classList.add('non-blurhashable');
                 return;
             }
-            let canvas = document.createElement('canvas');
+            const canvas = document.createElement('canvas');
             canvas.width = width;
             canvas.height = height;
-            let ctx = canvas.getContext('2d');
+            const ctx = canvas.getContext('2d');
-            let imgData = ctx.createImageData(width, height);
+            const imgData = ctx.createImageData(width, height);
 
             imgData.data.set(pixels);
             ctx.putImageData(imgData, 0, 0);
@@ -55,7 +55,7 @@ import 'css!./style';
         if (!entry) {
             throw new Error('entry cannot be null');
         }
-        let target = entry.target;
+        const target = entry.target;
         var source = undefined;
 
         if (target) {
@@ -78,7 +78,7 @@ import 'css!./style';
             throw new TypeError('url cannot be undefined');
         }
 
-        let preloaderImg = new Image();
+        const preloaderImg = new Image();
         preloaderImg.src = url;
 
         elem.classList.add('lazy-hidden');

src/components/indicators/indicators.js

@@ -82,7 +82,7 @@ export function enablePlayedIndicator(item) {
 
 export function getPlayedIndicatorHtml(item) {
     if (enablePlayedIndicator(item)) {
-        let userData = item.UserData || {};
+        const userData = item.UserData || {};
         if (userData.UnplayedItemCount) {
             return '<div class="countIndicator indicator">' + userData.UnplayedItemCount + '</div>';
         }

src/components/itemContextMenu.js

@@ -8,7 +8,6 @@ import browser from 'browser';
 import actionsheet from 'actionsheet';
 
 /* eslint-disable indent */
-
     export function getCommands(options) {
         const item = options.item;
         const user = options.user;
@@ -16,7 +15,7 @@ import actionsheet from 'actionsheet';
         const canPlay = playbackManager.canPlay(item);
         const restrictOptions = (browser.operaTv || browser.web0s) && !user.Policy.IsAdministrator;
 
-        let commands = [];
+        const commands = [];
 
         if (canPlay && item.MediaType !== 'Photo') {
             if (options.play !== false) {
@@ -367,7 +366,7 @@ import actionsheet from 'actionsheet';
                 case 'copy-stream': {
                     const downloadHref = apiClient.getItemDownloadUrl(itemId);
                     const textAreaCopy = function () {
-                        let textArea = document.createElement('textarea');
+                        const textArea = document.createElement('textarea');
                         textArea.value = downloadHref;
                         document.body.appendChild(textArea);
                         textArea.focus();

src/components/itemsrefresher.js

@@ -1,13 +1,11 @@
-define(['playbackManager', 'serverNotifications', 'events'], function (playbackManager, serverNotifications, events) {
+import playbackManager from 'playbackManager';
-    'use strict';
+import serverNotifications from 'serverNotifications';
+import events from 'events';
 
-    serverNotifications = serverNotifications.default || serverNotifications;
+function onUserDataChanged(e, apiClient, userData) {
-    playbackManager = playbackManager.default || playbackManager;
+    const instance = this;
 
-    function onUserDataChanged(e, apiClient, userData) {
+    const eventsToMonitor = getEventsToMonitor(instance);
-        var instance = this;
-
-        var eventsToMonitor = getEventsToMonitor(instance);
 
     // TODO: Check user data change reason?
     if (eventsToMonitor.indexOf('markfavorite') !== -1) {
@@ -15,72 +13,72 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     } else if (eventsToMonitor.indexOf('markplayed') !== -1) {
         instance.notifyRefreshNeeded();
     }
-    }
+}
 
-    function getEventsToMonitor(instance) {
+function getEventsToMonitor(instance) {
-        var options = instance.options;
+    const options = instance.options;
-        var monitor = options ? options.monitorEvents : null;
+    const monitor = options ? options.monitorEvents : null;
     if (monitor) {
         return monitor.split(',');
     }
 
     return [];
-    }
+}
 
-    function onTimerCreated(e, apiClient, data) {
+function onTimerCreated(e, apiClient, data) {
-        var instance = this;
+    const instance = this;
 
     if (getEventsToMonitor(instance).indexOf('timers') !== -1) {
         instance.notifyRefreshNeeded();
         return;
     }
-    }
+}
 
-    function onSeriesTimerCreated(e, apiClient, data) {
+function onSeriesTimerCreated(e, apiClient, data) {
-        var instance = this;
+    const instance = this;
     if (getEventsToMonitor(instance).indexOf('seriestimers') !== -1) {
         instance.notifyRefreshNeeded();
         return;
     }
-    }
+}
 
-    function onTimerCancelled(e, apiClient, data) {
+function onTimerCancelled(e, apiClient, data) {
-        var instance = this;
+    const instance = this;
 
     if (getEventsToMonitor(instance).indexOf('timers') !== -1) {
         instance.notifyRefreshNeeded();
         return;
     }
-    }
+}
 
-    function onSeriesTimerCancelled(e, apiClient, data) {
+function onSeriesTimerCancelled(e, apiClient, data) {
-        var instance = this;
+    const instance = this;
     if (getEventsToMonitor(instance).indexOf('seriestimers') !== -1) {
         instance.notifyRefreshNeeded();
         return;
     }
-    }
+}
 
-    function onLibraryChanged(e, apiClient, data) {
+function onLibraryChanged(e, apiClient, data) {
-        var instance = this;
+    const instance = this;
-        var eventsToMonitor = getEventsToMonitor(instance);
+    const eventsToMonitor = getEventsToMonitor(instance);
     if (eventsToMonitor.indexOf('seriestimers') !== -1 || eventsToMonitor.indexOf('timers') !== -1) {
         // yes this is an assumption
         return;
     }
 
-        var itemsAdded = data.ItemsAdded || [];
+    const itemsAdded = data.ItemsAdded || [];
-        var itemsRemoved = data.ItemsRemoved || [];
+    const itemsRemoved = data.ItemsRemoved || [];
     if (!itemsAdded.length && !itemsRemoved.length) {
         return;
     }
 
-        var options = instance.options || {};
+    const options = instance.options || {};
-        var parentId = options.parentId;
+    const parentId = options.parentId;
     if (parentId) {
-            var foldersAddedTo = data.FoldersAddedTo || [];
+        const foldersAddedTo = data.FoldersAddedTo || [];
-            var foldersRemovedFrom = data.FoldersRemovedFrom || [];
+        const foldersRemovedFrom = data.FoldersRemovedFrom || [];
-            var collectionFolders = data.CollectionFolders || [];
+        const collectionFolders = data.CollectionFolders || [];
 
         if (foldersAddedTo.indexOf(parentId) === -1 && foldersRemovedFrom.indexOf(parentId) === -1 && collectionFolders.indexOf(parentId) === -1) {
             return;
@@ -88,14 +86,14 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     }
 
     instance.notifyRefreshNeeded();
-    }
+}
 
-    function onPlaybackStopped(e, stopInfo) {
+function onPlaybackStopped(e, stopInfo) {
-        var instance = this;
+    const instance = this;
 
-        var state = stopInfo.state;
+    const state = stopInfo.state;
 
-        var eventsToMonitor = getEventsToMonitor(instance);
+    const eventsToMonitor = getEventsToMonitor(instance);
     if (state.NowPlayingItem && state.NowPlayingItem.MediaType === 'Video') {
         if (eventsToMonitor.indexOf('videoplayback') !== -1) {
             instance.notifyRefreshNeeded(true);
@@ -107,25 +105,26 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
             return;
         }
     }
-    }
+}
 
-    function addNotificationEvent(instance, name, handler, owner) {
+function addNotificationEvent(instance, name, handler, owner) {
-        var localHandler = handler.bind(instance);
+    const localHandler = handler.bind(instance);
     owner = owner || serverNotifications;
     events.on(owner, name, localHandler);
     instance['event_' + name] = localHandler;
-    }
+}
 
-    function removeNotificationEvent(instance, name, owner) {
+function removeNotificationEvent(instance, name, owner) {
-        var handler = instance['event_' + name];
+    const handler = instance['event_' + name];
     if (handler) {
         owner = owner || serverNotifications;
         events.off(owner, name, handler);
         instance['event_' + name] = null;
     }
-    }
+}
 
-    function ItemsRefresher(options) {
+class ItemsRefresher {
+    constructor(options) {
         this.options = options || {};
 
         addNotificationEvent(this, 'UserDataChanged', onUserDataChanged);
@@ -137,18 +136,18 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
         addNotificationEvent(this, 'playbackstop', onPlaybackStopped, playbackManager);
     }
 
-    ItemsRefresher.prototype.pause = function () {
+    pause() {
         clearRefreshInterval(this, true);
 
         this.paused = true;
-    };
+    }
 
-    ItemsRefresher.prototype.resume = function (options) {
+    resume(options) {
         this.paused = false;
 
-        var refreshIntervalEndTime = this.refreshIntervalEndTime;
+        const refreshIntervalEndTime = this.refreshIntervalEndTime;
         if (refreshIntervalEndTime) {
-            var remainingMs = refreshIntervalEndTime - new Date().getTime();
+            const remainingMs = refreshIntervalEndTime - new Date().getTime();
             if (remainingMs > 0 && !this.needsRefresh) {
                 resetRefreshInterval(this, remainingMs);
             } else {
@@ -162,9 +161,9 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
         }
 
         return Promise.resolve();
-    };
+    }
 
-    ItemsRefresher.prototype.refreshItems = function () {
+    refreshItems() {
         if (!this.fetchData) {
             return Promise.resolve();
         }
@@ -177,15 +176,15 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
         this.needsRefresh = false;
 
         return this.fetchData().then(onDataFetched.bind(this));
-    };
+    }
 
-    ItemsRefresher.prototype.notifyRefreshNeeded = function (isInForeground) {
+    notifyRefreshNeeded(isInForeground) {
         if (this.paused) {
             this.needsRefresh = true;
             return;
         }
 
-        var timeout = this.refreshTimeout;
+        const timeout = this.refreshTimeout;
         if (timeout) {
             clearTimeout(timeout);
         }
@@ -195,44 +194,9 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
         } else {
             this.refreshTimeout = setTimeout(this.refreshItems.bind(this), 10000);
         }
-    };
-
-    function clearRefreshInterval(instance, isPausing) {
-        if (instance.refreshInterval) {
-            clearInterval(instance.refreshInterval);
-            instance.refreshInterval = null;
-
-            if (!isPausing) {
-                instance.refreshIntervalEndTime = null;
-            }
-        }
     }
 
-    function resetRefreshInterval(instance, intervalMs) {
+    destroy() {
-        clearRefreshInterval(instance);
-
-        if (!intervalMs) {
-            var options = instance.options;
-            if (options) {
-                intervalMs = options.refreshIntervalMs;
-            }
-        }
-
-        if (intervalMs) {
-            instance.refreshInterval = setInterval(instance.notifyRefreshNeeded.bind(instance), intervalMs);
-            instance.refreshIntervalEndTime = new Date().getTime() + intervalMs;
-        }
-    }
-
-    function onDataFetched(result) {
-        resetRefreshInterval(this);
-
-        if (this.afterRefresh) {
-            this.afterRefresh(result);
-        }
-    }
-
-    ItemsRefresher.prototype.destroy = function () {
         clearRefreshInterval(this);
 
         removeNotificationEvent(this, 'UserDataChanged');
@@ -245,7 +209,42 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
 
         this.fetchData = null;
         this.options = null;
-    };
+    }
+}
 
-    return ItemsRefresher;
+function clearRefreshInterval(instance, isPausing) {
-});
+    if (instance.refreshInterval) {
+        clearInterval(instance.refreshInterval);
+        instance.refreshInterval = null;
+
+        if (!isPausing) {
+            instance.refreshIntervalEndTime = null;
+        }
+    }
+}
+
+function resetRefreshInterval(instance, intervalMs) {
+    clearRefreshInterval(instance);
+
+    if (!intervalMs) {
+        const options = instance.options;
+        if (options) {
+            intervalMs = options.refreshIntervalMs;
+        }
+    }
+
+    if (intervalMs) {
+        instance.refreshInterval = setInterval(instance.notifyRefreshNeeded.bind(instance), intervalMs);
+        instance.refreshIntervalEndTime = new Date().getTime() + intervalMs;
+    }
+}
+
+function onDataFetched(result) {
+    resetRefreshInterval(this);
+
+    if (this.afterRefresh) {
+        this.afterRefresh(result);
+    }
+}
+
+export default ItemsRefresher;

src/components/layoutManager.js

@@ -1,9 +1,8 @@
-define(['browser', 'appSettings', 'events'], function (browser, appSettings, events) {
+import browser from 'browser';
-    'use strict';
+import appSettings from 'appSettings';
+import events from 'events';
 
-    browser = browser.default || browser;
+function setLayout(instance, layout, selectedLayout) {
-
-    function setLayout(instance, layout, selectedLayout) {
     if (layout === selectedLayout) {
         instance[layout] = true;
         document.documentElement.classList.add('layout-' + layout);
@@ -11,13 +10,10 @@ define(['browser', 'appSettings', 'events'], function (browser, appSettings, eve
         instance[layout] = false;
         document.documentElement.classList.remove('layout-' + layout);
     }
-    }
+}
 
-    function LayoutManager() {
+class LayoutManager {
-
+    setLayout(layout, save) {
-    }
-
-    LayoutManager.prototype.setLayout = function (layout, save) {
         if (!layout || layout === 'auto') {
             this.autoLayout();
 
@@ -35,13 +31,13 @@ define(['browser', 'appSettings', 'events'], function (browser, appSettings, eve
         }
 
         events.trigger(this, 'modechange');
-    };
+    }
 
-    LayoutManager.prototype.getSavedLayout = function (layout) {
+    getSavedLayout(layout) {
         return appSettings.get('layout');
-    };
+    }
 
-    LayoutManager.prototype.autoLayout = function () {
+    autoLayout() {
         // Take a guess at initial layout. The consuming app can override
         if (browser.mobile) {
             this.setLayout('mobile', false);
@@ -50,16 +46,16 @@ define(['browser', 'appSettings', 'events'], function (browser, appSettings, eve
         } else {
             this.setLayout(this.defaultLayout || 'tv', false);
         }
-    };
+    }
 
-    LayoutManager.prototype.init = function () {
+    init() {
-        var saved = this.getSavedLayout();
+        const saved = this.getSavedLayout();
         if (saved) {
             this.setLayout(saved, false);
         } else {
             this.autoLayout();
         }
-    };
+    }
+}
 
-    return new LayoutManager();
+export default new LayoutManager();
-});

src/components/libraryoptionseditor/libraryoptionseditor.js

@@ -75,9 +75,9 @@ import 'emby-input';
             html += '</h3>';
             html += '</div>';
             if (i > 0) {
-                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonUp')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Up')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
             } else if (plugins.length > 1) {
-                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonDown')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Down')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
             }
             html += '</div>';
         }
@@ -131,9 +131,9 @@ import 'emby-input';
             html += '</h3>';
             html += '</div>';
             if (index > 0) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonUp') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_up"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Up') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_up"></span></button>';
             } else if (plugins.length > 1) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonDown') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_down"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Down') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_down"></span></button>';
             }
             html += '</div>';
         });
@@ -197,9 +197,9 @@ import 'emby-input';
             html += '</h3>';
             html += '</div>';
             if (i > 0) {
-                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonUp')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Up')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
             } else if (plugins.length > 1) {
-                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonDown')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Down')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
             }
             html += '</div>';
         }
@@ -236,9 +236,9 @@ import 'emby-input';
             html += '</h3>';
             html += '</div>';
             if (i > 0) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonUp') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_up"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Up') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_up"></span></button>';
             } else if (plugins.length > 1) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonDown') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_down"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Down') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_down"></span></button>';
             }
             html += '</div>';
         }
@@ -291,13 +291,13 @@ import 'emby-input';
         const btnSortable = elem.querySelector('.btnSortable');
         const inner = btnSortable.querySelector('.material-icons');
         if (elem.previousSibling) {
-            btnSortable.title = globalize.translate('ButtonUp');
+            btnSortable.title = globalize.translate('Up');
             btnSortable.classList.add('btnSortableMoveUp');
             btnSortable.classList.remove('btnSortableMoveDown');
             inner.classList.remove('keyboard_arrow_down');
             inner.classList.add('keyboard_arrow_up');
         } else {
-            btnSortable.title = globalize.translate('ButtonDown');
+            btnSortable.title = globalize.translate('Down');
             btnSortable.classList.remove('btnSortableMoveUp');
             btnSortable.classList.add('btnSortableMoveDown');
             inner.classList.remove('keyboard_arrow_up');

src/components/mediaLibraryCreator/mediaLibraryCreator.template.html

@@ -24,8 +24,8 @@
 
         <div class="folders">
             <div style="display: flex; align-items: center;">
-                <h1 style="margin: .5em 0;">${HeadersFolders}</h1>
+                <h1 style="margin: .5em 0;">${Folders}</h1>
-                <button is="emby-button" type="button" class="fab btnAddFolder submit" style="margin-left:1em;" title="${ButtonAdd}">
+                <button is="emby-button" type="button" class="fab btnAddFolder submit" style="margin-left:1em;" title="${Add}">
                     <span class="material-icons add"></span>
                 </button>
             </div>

src/components/mediaLibraryEditor/mediaLibraryEditor.js

@@ -76,7 +76,7 @@ import 'flexStyles';
             confirm({
                 title: globalize.translate('HeaderRemoveMediaLocation'),
                 text: globalize.translate('MessageConfirmRemoveMediaLocation'),
-                confirmText: globalize.translate('ButtonDelete'),
+                confirmText: globalize.translate('Delete'),
                 primary: 'delete'
             }).then(() => {
                 const refreshAfterChange = currentOptions.refresh;

src/components/mediaLibraryEditor/mediaLibraryEditor.template.html

@@ -18,8 +18,8 @@
 
         <div class="folders hide">
             <div style="display: flex; align-items: center;">
-                <h1 style="margin: .5em 0;">${HeadersFolders}</h1>
+                <h1 style="margin: .5em 0;">${Folders}</h1>
-                <button is="emby-button" type="button" class="fab btnAddFolder submit" style="margin-left:1em;" title="${ButtonAdd}">
+                <button is="emby-button" type="button" class="fab btnAddFolder submit" style="margin-left:1em;" title="${Add}">
                     <span class="material-icons add"></span>
                 </button>
             </div>

src/components/mediainfo/mediainfo.js

@@ -9,7 +9,6 @@ import 'programStyles';
 import 'emby-button';
 
 /* eslint-disable indent */
-
     function getTimerIndicator(item) {
         let status;
 
@@ -208,7 +207,7 @@ import 'emby-button';
                     });
                 } else if (item.IsSeries && !item.IsRepeat) {
                     miscInfo.push({
-                        html: `<div class="mediaInfoProgramAttribute mediaInfoItem newTvProgram">${globalize.translate('AttributeNew')}</div>`
+                        html: `<div class="mediaInfoProgramAttribute mediaInfoItem newTvProgram">${globalize.translate('New')}</div>`
                     });
                 } else if (item.IsSeries && item.IsRepeat) {
                     miscInfo.push({

src/components/metadataEditor/metadataEditor.js

@@ -6,7 +6,6 @@ import loading from 'loading';
 import focusManager from 'focusManager';
 import connectionManager from 'connectionManager';
 import globalize from 'globalize';
-import require from 'require';
 import shell from 'shell';
 import 'emby-checkbox';
 import 'emby-input';
@@ -37,7 +36,7 @@ import 'flexStyles';
 
     function submitUpdatedItem(form, item) {
         function afterContentTypeUpdated() {
-            require(['toast'], function (toast) {
+            import('toast').then(({default: toast}) => {
                 toast(globalize.translate('MessageItemSaved'));
             });
 
@@ -227,7 +226,7 @@ import 'flexStyles';
     }
 
     function editPerson(context, person, index) {
-        require(['personEditor'], function (personEditor) {
+        import('personEditor').then(({default: personEditor}) => {
             personEditor.show(person).then(function (updatedPerson) {
                 const isNew = index === -1;
 
@@ -246,14 +245,14 @@ import 'flexStyles';
         if (parentId) {
             reload(context, parentId, item.ServerId);
         } else {
-            require(['appRouter'], function (appRouter) {
+            import('appRouter').then(({default: appRouter}) => {
                 appRouter.goHome();
             });
         }
     }
 
     function showMoreMenu(context, button, user) {
-        require(['itemContextMenu'], function (itemContextMenu) {
+        import('itemContextMenu').then(({default: itemContextMenu}) => {
             var item = currentItem;
 
             itemContextMenu.show({
@@ -907,7 +906,7 @@ import 'flexStyles';
     }
 
     function populatePeople(context, people) {
-        let lastType = '';
+        const lastType = '';
         let html = '';
 
         const elem = context.querySelector('#peopleList');

src/components/multiSelect/multiSelect.js

@@ -198,7 +198,7 @@ import 'css!./multiSelect';
 
             if (user.Policy.EnableContentDownloading && appHost.supports('filedownload')) {
                 menuItems.push({
-                    name: globalize.translate('ButtonDownload'),
+                    name: globalize.translate('Download'),
                     id: 'download',
                     icon: 'file_download'
                 });

src/components/notifications/notifications.js

@@ -1,10 +1,9 @@
-define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'require'], function (serverNotifications, playbackManager, events, globalize, require) {
+import serverNotifications from 'serverNotifications';
-    'use strict';
+import playbackManager from 'playbackManager';
+import events from 'events';
+import globalize from 'globalize';
 
-    playbackManager = playbackManager.default || playbackManager;
+function onOneDocumentClick() {
-    serverNotifications = serverNotifications.default || serverNotifications;
-
-    function onOneDocumentClick() {
     document.removeEventListener('click', onOneDocumentClick);
     document.removeEventListener('keydown', onOneDocumentClick);
 
@@ -13,14 +12,14 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
         /* eslint-disable-next-line compat/compat */
         Notification.requestPermission();
     }
-    }
+}
 
-    document.addEventListener('click', onOneDocumentClick);
+document.addEventListener('click', onOneDocumentClick);
-    document.addEventListener('keydown', onOneDocumentClick);
+document.addEventListener('keydown', onOneDocumentClick);
 
-    var serviceWorkerRegistration;
+let serviceWorkerRegistration;
 
-    function closeAfter(notification, timeoutMs) {
+function closeAfter(notification, timeoutMs) {
     setTimeout(function () {
         if (notification.close) {
             notification.close();
@@ -28,27 +27,27 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
             notification.cancel();
         }
     }, timeoutMs);
-    }
+}
 
-    function resetRegistration() {
+function resetRegistration() {
     /* eslint-disable-next-line compat/compat */
-        var serviceWorker = navigator.serviceWorker;
+    let serviceWorker = navigator.serviceWorker;
     if (serviceWorker) {
         serviceWorker.ready.then(function (registration) {
             serviceWorkerRegistration = registration;
         });
     }
-    }
+}
 
-    resetRegistration();
+resetRegistration();
 
-    function showPersistentNotification(title, options, timeoutMs) {
+function showPersistentNotification(title, options, timeoutMs) {
     serviceWorkerRegistration.showNotification(title, options);
-    }
+}
 
-    function showNonPersistentNotification(title, options, timeoutMs) {
+function showNonPersistentNotification(title, options, timeoutMs) {
     try {
-            var notif = new Notification(title, options); /* eslint-disable-line compat/compat */
+        let notif = new Notification(title, options); /* eslint-disable-line compat/compat */
 
         if (notif.show) {
             notif.show();
@@ -65,10 +64,10 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
             throw err;
         }
     }
-    }
+}
 
-    function showNotification(options, timeoutMs, apiClient) {
+function showNotification(options, timeoutMs, apiClient) {
-        var title = options.title;
+    let title = options.title;
 
     options.data = options.data || {};
     options.data.serverId = apiClient.serverInfo().Id;
@@ -83,20 +82,20 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
     }
 
     showNonPersistentNotification(title, options, timeoutMs);
-    }
+}
 
-    function showNewItemNotification(item, apiClient) {
+function showNewItemNotification(item, apiClient) {
     if (playbackManager.isPlayingLocally(['Video'])) {
         return;
     }
 
-        var body = item.Name;
+    let body = item.Name;
 
     if (item.SeriesName) {
         body = item.SeriesName + ' - ' + body;
     }
 
-        var notification = {
+    let notification = {
         title: 'New ' + item.Type,
         body: body,
         vibrate: true,
@@ -104,7 +103,7 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
         data: {}
     };
 
-        var imageTags = item.ImageTags || {};
+    let imageTags = item.ImageTags || {};
 
     if (imageTags.Primary) {
         notification.icon = apiClient.getScaledImageUrl(item.Id, {
@@ -115,10 +114,10 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
     }
 
     showNotification(notification, 15000, apiClient);
-    }
+}
 
-    function onLibraryChanged(data, apiClient) {
+function onLibraryChanged(data, apiClient) {
-        var newItems = data.ItemsAdded;
+    let newItems = data.ItemsAdded;
 
     if (!newItems.length) {
         return;
@@ -141,26 +140,26 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
         EnableTotalRecordCount: false
 
     }).then(function (result) {
-            var items = result.Items;
+        let items = result.Items;
 
-            for (var i = 0, length = items.length ; i < length; i++) {
+        for (const item of items) {
-                showNewItemNotification(items[i], apiClient);
+            showNewItemNotification(item, apiClient);
         }
     });
-    }
+}
 
-    function getIconUrl(name) {
+function getIconUrl(name) {
     name = name || 'notificationicon.png';
-        return require.toUrl('.').split('?')[0] + '/' + name;
+    return './components/notifications/' + name;
-    }
+}
 
-    function showPackageInstallNotification(apiClient, installation, status) {
+function showPackageInstallNotification(apiClient, installation, status) {
     apiClient.getCurrentUser().then(function (user) {
         if (!user.Policy.IsAdministrator) {
             return;
         }
 
-            var notification = {
+        let notification = {
             tag: 'install' + installation.Id,
             data: {}
         };
@@ -189,58 +188,58 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
         }
 
         if (status === 'progress') {
-                var percentComplete = Math.round(installation.PercentComplete || 0);
+            let percentComplete = Math.round(installation.PercentComplete || 0);
 
             notification.body = percentComplete + '% complete.';
         }
 
-            var timeout = status === 'cancelled' ? 5000 : 0;
+        let timeout = status === 'cancelled' ? 5000 : 0;
 
         showNotification(notification, timeout, apiClient);
     });
-    }
+}
 
-    events.on(serverNotifications, 'LibraryChanged', function (e, apiClient, data) {
+events.on(serverNotifications, 'LibraryChanged', function (e, apiClient, data) {
     onLibraryChanged(data, apiClient);
-    });
+});
 
-    events.on(serverNotifications, 'PackageInstallationCompleted', function (e, apiClient, data) {
+events.on(serverNotifications, 'PackageInstallationCompleted', function (e, apiClient, data) {
     showPackageInstallNotification(apiClient, data, 'completed');
-    });
+});
 
-    events.on(serverNotifications, 'PackageInstallationFailed', function (e, apiClient, data) {
+events.on(serverNotifications, 'PackageInstallationFailed', function (e, apiClient, data) {
     showPackageInstallNotification(apiClient, data, 'failed');
-    });
+});
 
-    events.on(serverNotifications, 'PackageInstallationCancelled', function (e, apiClient, data) {
+events.on(serverNotifications, 'PackageInstallationCancelled', function (e, apiClient, data) {
     showPackageInstallNotification(apiClient, data, 'cancelled');
-    });
+});
 
-    events.on(serverNotifications, 'PackageInstalling', function (e, apiClient, data) {
+events.on(serverNotifications, 'PackageInstalling', function (e, apiClient, data) {
     showPackageInstallNotification(apiClient, data, 'progress');
-    });
+});
 
-    events.on(serverNotifications, 'ServerShuttingDown', function (e, apiClient, data) {
+events.on(serverNotifications, 'ServerShuttingDown', function (e, apiClient, data) {
-        var serverId = apiClient.serverInfo().Id;
+    let serverId = apiClient.serverInfo().Id;
-        var notification = {
+    let notification = {
         tag: 'restart' + serverId,
         title: globalize.translate('ServerNameIsShuttingDown', apiClient.serverInfo().Name)
     };
     showNotification(notification, 0, apiClient);
-    });
+});
 
-    events.on(serverNotifications, 'ServerRestarting', function (e, apiClient, data) {
+events.on(serverNotifications, 'ServerRestarting', function (e, apiClient, data) {
-        var serverId = apiClient.serverInfo().Id;
+    let serverId = apiClient.serverInfo().Id;
-        var notification = {
+    let notification = {
         tag: 'restart' + serverId,
         title: globalize.translate('ServerNameIsRestarting', apiClient.serverInfo().Name)
     };
     showNotification(notification, 0, apiClient);
-    });
+});
 
-    events.on(serverNotifications, 'RestartRequired', function (e, apiClient) {
+events.on(serverNotifications, 'RestartRequired', function (e, apiClient) {
-        var serverId = apiClient.serverInfo().Id;
+    let serverId = apiClient.serverInfo().Id;
-        var notification = {
+    let notification = {
         tag: 'restart' + serverId,
         title: globalize.translate('PleaseRestartServerName', apiClient.serverInfo().Name)
     };
@@ -255,5 +254,5 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
         ];
 
     showNotification(notification, 0, apiClient);
-    });
 });
+

src/components/nowPlayingBar/nowPlayingBar.js

@@ -500,20 +500,20 @@ import 'emby-ratingbutton';
         const textLines = nowPlayingItem ? nowPlayingHelper.getNowPlayingNames(nowPlayingItem) : [];
         nowPlayingTextElement.innerHTML = '';
         if (textLines) {
-            let itemText = document.createElement('div');
+            const itemText = document.createElement('div');
-            let secondaryText = document.createElement('div');
+            const secondaryText = document.createElement('div');
             secondaryText.classList.add('nowPlayingBarSecondaryText');
             if (textLines.length > 1) {
                 textLines[1].secondary = true;
                 if (textLines[1].text) {
-                    let text = document.createElement('a');
+                    const text = document.createElement('a');
                     text.innerHTML = textLines[1].text;
                     secondaryText.appendChild(text);
                 }
             }
 
             if (textLines[0].text) {
-                let text = document.createElement('a');
+                const text = document.createElement('a');
                 text.innerHTML = textLines[0].text;
                 itemText.appendChild(text);
             }
@@ -555,10 +555,10 @@ import 'emby-ratingbutton';
                     if (!layoutManager.mobile) {
                         let contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu');
                         // We remove the previous event listener by replacing the item in each update event
-                        let contextButtonClone = contextButton.cloneNode(true);
+                        const contextButtonClone = contextButton.cloneNode(true);
                         contextButton.parentNode.replaceChild(contextButtonClone, contextButton);
                         contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu');
-                        let options = {
+                        const options = {
                             play: false,
                             queue: false,
                             clearQueue: true,
@@ -600,10 +600,10 @@ import 'emby-ratingbutton';
             return;
         }
 
-        let shuffleMode = playbackManager.getQueueShuffleMode();
+        const shuffleMode = playbackManager.getQueueShuffleMode();
-        let context = nowPlayingBarElement;
+        const context = nowPlayingBarElement;
         const cssClass = 'buttonActive';
-        let toggleShuffleButton = context.querySelector('.btnShuffleQueue');
+        const toggleShuffleButton = context.querySelector('.btnShuffleQueue');
         switch (shuffleMode) {
             case 'Shuffle':
                 toggleShuffleButton.classList.add(cssClass);

src/components/playback/mediasession.js

@@ -127,7 +127,7 @@ import connectionManager from 'connectionManager';
                 artwork: getImageUrls(item)
             });
         } else {
-            let itemImageUrl = seriesImageUrl(item, { maxHeight: 3000 }) || imageUrl(item, { maxHeight: 3000 });
+            const itemImageUrl = seriesImageUrl(item, { maxHeight: 3000 }) || imageUrl(item, { maxHeight: 3000 });
 
             window.NativeShell.updateMediaSession({
                 action: eventName,
@@ -244,10 +244,10 @@ import connectionManager from 'connectionManager';
 
         /* eslint-disable-next-line compat/compat */
         navigator.mediaSession.setActionHandler('seekto', function (object) {
-            let item = playbackManager.getPlayerState(currentPlayer).NowPlayingItem;
+            const item = playbackManager.getPlayerState(currentPlayer).NowPlayingItem;
             // Convert to ms
-            let duration = parseInt(item.RunTimeTicks ? (item.RunTimeTicks / 10000) : 0);
+            const duration = parseInt(item.RunTimeTicks ? (item.RunTimeTicks / 10000) : 0);
-            let wantedTime = object.seekTime * 1000;
+            const wantedTime = object.seekTime * 1000;
             playbackManager.seekPercent(wantedTime / duration * 100, currentPlayer);
         });
     }

src/components/playback/playbackmanager.js

@@ -8,7 +8,7 @@ import * as userSettings from 'userSettings';
 import globalize from 'globalize';
 import connectionManager from 'connectionManager';
 import loading from 'loading';
-import apphost from 'apphost';
+import appHost from 'apphost';
 import screenfull from 'screenfull';
 
 function enableLocalPlaylistManagement(player) {
@@ -322,7 +322,7 @@ function getAudioStreamUrl(item, transcodingProfile, directPlayContainers, maxBi
         PlaySessionId: startingPlaySession,
         StartTimeTicks: startPosition || 0,
         EnableRedirection: true,
-        EnableRemoteMedia: apphost.supports('remoteaudio')
+        EnableRemoteMedia: appHost.supports('remoteaudio')
     });
 }
 
@@ -606,7 +606,7 @@ function supportsDirectPlay(apiClient, item, mediaSource) {
     const isFolderRip = mediaSource.VideoType === 'BluRay' || mediaSource.VideoType === 'Dvd' || mediaSource.VideoType === 'HdDvd';
 
     if (mediaSource.SupportsDirectPlay || isFolderRip) {
-        if (mediaSource.IsRemote && !apphost.supports('remotevideo')) {
+        if (mediaSource.IsRemote && !appHost.supports('remotevideo')) {
             return Promise.resolve(false);
         }
 
@@ -1416,8 +1416,8 @@ class PlaybackManager {
 
         self.toggleFullscreen = function (player) {
             player = player || self._currentPlayer;
-            if (!player.isLocalPlayer || player.toggleFulscreen) {
+            if (!player.isLocalPlayer || player.toggleFullscreen) {
-                return player.toggleFulscreen();
+                return player.toggleFullscreen();
             }
 
             if (screenfull.isEnabled) {
@@ -3156,7 +3156,7 @@ class PlaybackManager {
             return streamInfo ? streamInfo.playbackStartTimeTicks : null;
         };
 
-        if (apphost.supports('remotecontrol')) {
+        if (appHost.supports('remotecontrol')) {
             import('serverNotifications').then(({ default: serverNotifications }) => {
                 events.on(serverNotifications, 'ServerShuttingDown', self.setDefaultPlayerActive.bind(self));
                 events.on(serverNotifications, 'ServerRestarting', self.setDefaultPlayerActive.bind(self));
@@ -3520,7 +3520,7 @@ class PlaybackManager {
                 'PlayTrailers'
             ];
 
-            if (apphost.supports('fullscreenchange')) {
+            if (appHost.supports('fullscreenchange')) {
                 list.push('ToggleFullscreen');
             }
 

src/components/playbackSettings/playbackSettings.template.html

@@ -99,6 +99,6 @@
     </div>
 
     <button is="emby-button" type="submit" class="raised button-submit block btnSave hide">
-        <span>${ButtonSave}</span>
+        <span>${Save}</span>
     </button>
 </form>

src/components/qualityOptions.js

@@ -1,7 +1,6 @@
-define(['globalize'], function (globalize) {
+import globalize from 'globalize';
-    'use strict';
 
-    function getVideoQualityOptions(options) {
+export function getVideoQualityOptions(options) {
     var maxStreamingBitrate = options.currentMaxBitrate;
     var videoWidth = options.videoWidth;
     var videoHeight = options.videoHeight;
@@ -100,9 +99,9 @@ define(['globalize'], function (globalize) {
     }
 
     return qualityOptions;
-    }
+}
 
-    function getAudioQualityOptions(options) {
+export function getAudioQualityOptions(options) {
     var maxStreamingBitrate = options.currentMaxBitrate;
 
     var qualityOptions = [];
@@ -151,10 +150,9 @@ define(['globalize'], function (globalize) {
     }
 
     return qualityOptions;
-    }
+}
 
-    return {
+export default {
-        getVideoQualityOptions: getVideoQualityOptions,
+    getVideoQualityOptions,
-        getAudioQualityOptions: getAudioQualityOptions
+    getAudioQualityOptions
-    };
+};
-});

src/components/recordingcreator/recordingbutton.js

@@ -1,37 +1,40 @@
-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) {
+import connectionManager from 'connectionManager';
-    'use strict';
+import dom from 'dom';
+import recordingHelper from 'recordingHelper';
+import 'paper-icon-button-light';
+import 'emby-button';
+import 'css!./recordingfields';
 
-    recordingHelper = recordingHelper.default || recordingHelper;
+function onRecordingButtonClick(e) {
-
+    const item = this.item;
-    function onRecordingButtonClick(e) {
-        var item = this.item;
 
     if (item) {
-            var serverId = item.ServerId;
+        const serverId = item.ServerId;
-            var programId = item.Id;
+        const programId = item.Id;
-            var timerId = item.TimerId;
+        const timerId = item.TimerId;
-            var timerStatus = item.Status;
+        const timerStatus = item.Status;
-            var seriesTimerId = item.SeriesTimerId;
+        const seriesTimerId = item.SeriesTimerId;
 
-            var instance = this;
+        const instance = this;
 
         recordingHelper.toggleRecording(serverId, programId, timerId, timerStatus, seriesTimerId).then(function () {
             instance.refresh(serverId, programId);
         });
     }
-    }
+}
 
-    function setButtonIcon(button, icon) {
+function setButtonIcon(button, icon) {
-        var inner = button.querySelector('.material-icons');
+    const inner = button.querySelector('.material-icons');
     inner.classList.remove('fiber_smart_record');
     inner.classList.remove('fiber_manual_record');
     inner.classList.add(icon);
-    }
+}
 
-    function RecordingButton(options) {
+class RecordingButton {
+    constructor(options) {
         this.options = options;
 
-        var button = options.button;
+        const button = options.button;
 
         setButtonIcon(button, 'fiber_manual_record');
 
@@ -41,7 +44,7 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
             this.refresh(options.itemId, options.serverId);
         }
 
-        var clickFn = onRecordingButtonClick.bind(this);
+        const clickFn = onRecordingButtonClick.bind(this);
         this.clickFn = clickFn;
 
         dom.addEventListener(button, 'click', clickFn, {
@@ -49,8 +52,49 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
         });
     }
 
-    function getIndicatorIcon(item) {
+    refresh(serverId, itemId) {
-        var status;
+        const apiClient = connectionManager.getApiClient(serverId);
+        const self = this;
+        apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
+            self.refreshItem(item);
+        });
+    }
+
+    refreshItem(item) {
+        const options = this.options;
+        const button = options.button;
+        this.item = item;
+        setButtonIcon(button, getIndicatorIcon(item));
+
+        if (item.TimerId && (item.Status || 'Cancelled') !== 'Cancelled') {
+            button.classList.add('recordingIcon-active');
+        } else {
+            button.classList.remove('recordingIcon-active');
+        }
+    }
+
+    destroy() {
+        const options = this.options;
+
+        if (options) {
+            const button = options.button;
+
+            const clickFn = this.clickFn;
+
+            if (clickFn) {
+                dom.removeEventListener(button, 'click', clickFn, {
+                    passive: true
+                });
+            }
+        }
+
+        this.options = null;
+        this.item = null;
+    }
+}
+
+function getIndicatorIcon(item) {
+    let status;
 
     if (item.Type === 'SeriesTimer') {
         return 'fiber_smart_record';
@@ -69,47 +113,6 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
     }
 
     return 'fiber_manual_record';
-    }
+}
 
-    RecordingButton.prototype.refresh = function (serverId, itemId) {
+export default RecordingButton;
-        var apiClient = connectionManager.getApiClient(serverId);
-        var self = this;
-        apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
-            self.refreshItem(item);
-        });
-    };
-
-    RecordingButton.prototype.refreshItem = function (item) {
-        var options = this.options;
-        var button = options.button;
-        this.item = item;
-        setButtonIcon(button, getIndicatorIcon(item));
-
-        if (item.TimerId && (item.Status || 'Cancelled') !== 'Cancelled') {
-            button.classList.add('recordingIcon-active');
-        } else {
-            button.classList.remove('recordingIcon-active');
-        }
-    };
-
-    RecordingButton.prototype.destroy = function () {
-        var options = this.options;
-
-        if (options) {
-            var button = options.button;
-
-            var clickFn = this.clickFn;
-
-            if (clickFn) {
-                dom.removeEventListener(button, 'click', clickFn, {
-                    passive: true
-                });
-            }
-        }
-
-        this.options = null;
-        this.item = null;
-    };
-
-    return RecordingButton;
-});

src/components/recordingcreator/recordingcreator.js

@@ -1,17 +1,33 @@
-define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'connectionManager', 'require', 'loading', 'scrollHelper', 'datetime', 'imageLoader', 'recordingFields', 'events', 'emby-checkbox', 'emby-button', 'emby-collapse', 'emby-input', 'paper-icon-button-light', 'css!./../formdialog', 'css!./recordingcreator', 'material-icons'], function (dialogHelper, globalize, layoutManager, mediaInfo, appHost, connectionManager, require, loading, scrollHelper, datetime, imageLoader, recordingFields, events) {
+import dialogHelper from 'dialogHelper';
-    'use strict';
+import globalize from 'globalize';
+import layoutManager from 'layoutManager';
+import mediaInfo from 'mediaInfo';
+import connectionManager from 'connectionManager';
+import require from 'require';
+import loading from 'loading';
+import scrollHelper from 'scrollHelper';
+import datetime from 'datetime';
+import imageLoader from 'imageLoader';
+import recordingFields from 'recordingFields';
+import events from 'events';
+import 'emby-checkbox';
+import 'emby-button';
+import 'emby-collapse';
+import 'emby-input';
+import 'paper-icon-button-light';
+import 'css!./../formdialog';
+import 'css!./recordingcreator';
+import 'material-icons';
 
-    scrollHelper = scrollHelper.default || scrollHelper;
+let currentDialog;
+let closeAction;
+let currentRecordingFields;
 
-    var currentDialog;
+function closeDialog() {
-    var closeAction;
-    var currentRecordingFields;
-
-    function closeDialog() {
     dialogHelper.close(currentDialog);
-    }
+}
 
-    function init(context) {
+function init(context) {
     context.querySelector('.btnPlay').addEventListener('click', function () {
         closeAction = 'play';
         closeDialog();
@@ -21,10 +37,10 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
         closeAction = null;
         closeDialog();
     });
-    }
+}
 
-    function getImageUrl(item, apiClient, imageHeight) {
+function getImageUrl(item, apiClient, imageHeight) {
-        var imageTags = item.ImageTags || {};
+    const imageTags = item.ImageTags || {};
 
     if (item.PrimaryImageTag) {
         imageTags.Primary = item.PrimaryImageTag;
@@ -45,12 +61,12 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     return null;
-    }
+}
 
-    function renderRecording(context, defaultTimer, program, apiClient, refreshRecordingStateOnly) {
+function renderRecording(context, defaultTimer, program, apiClient, refreshRecordingStateOnly) {
     if (!refreshRecordingStateOnly) {
-            var imgUrl = getImageUrl(program, apiClient, 200);
+        const imgUrl = getImageUrl(program, apiClient, 200);
-            var imageContainer = context.querySelector('.recordingDialog-imageContainer');
+        const imageContainer = context.querySelector('.recordingDialog-imageContainer');
 
         if (imgUrl) {
             imageContainer.innerHTML = '<img src="' + require.toUrl('.').split('?')[0] + '/empty.png" data-src="' + imgUrl + '" class="recordingDialog-img lazy" />';
@@ -67,8 +83,8 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
         context.querySelector('.itemGenres').innerHTML = (program.Genres || []).join(' / ');
         context.querySelector('.itemOverview').innerHTML = program.Overview || '';
 
-            var formDialogFooter = context.querySelector('.formDialogFooter');
+        const formDialogFooter = context.querySelector('.formDialogFooter');
-            var now = new Date();
+        const now = new Date();
         if (now >= datetime.parseISO8601Date(program.StartDate, true) && now < datetime.parseISO8601Date(program.EndDate, true)) {
             formDialogFooter.classList.remove('hide');
         } else {
@@ -82,31 +98,31 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     });
 
     loading.hide();
-    }
+}
 
-    function reload(context, programId, serverId, refreshRecordingStateOnly) {
+function reload(context, programId, serverId, refreshRecordingStateOnly) {
     loading.show();
 
-        var apiClient = connectionManager.getApiClient(serverId);
+    const apiClient = connectionManager.getApiClient(serverId);
 
-        var promise1 = apiClient.getNewLiveTvTimerDefaults({ programId: programId });
+    const promise1 = apiClient.getNewLiveTvTimerDefaults({ programId: programId });
-        var promise2 = apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId());
+    const promise2 = apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId());
 
     Promise.all([promise1, promise2]).then(function (responses) {
-            var defaults = responses[0];
+        const defaults = responses[0];
-            var program = responses[1];
+        const program = responses[1];
 
         renderRecording(context, defaults, program, apiClient, refreshRecordingStateOnly);
     });
-    }
+}
 
-    function executeCloseAction(action, programId, serverId) {
+function executeCloseAction(action, programId, serverId) {
     if (action === 'play') {
-            require(['playbackManager'], function (playbackManager) {
+        import('playbackManager').then(({ default: playbackManager }) => {
-                var apiClient = connectionManager.getApiClient(serverId);
+            const apiClient = connectionManager.getApiClient(serverId);
 
             apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId()).then(function (item) {
-                    playbackManager.default.play({
+                playbackManager.play({
                     ids: [item.ChannelId],
                     serverId: serverId
                 });
@@ -114,16 +130,16 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
         });
         return;
     }
-    }
+}
 
-    function showEditor(itemId, serverId) {
+function showEditor(itemId, serverId) {
     return new Promise(function (resolve, reject) {
         closeAction = null;
 
         loading.show();
 
-            require(['text!./recordingcreator.template.html'], function (template) {
+        import('text!./recordingcreator.template.html').then(({ default: template }) => {
-                var dialogOptions = {
+            const dialogOptions = {
                 removeOnClose: true,
                 scrollY: false
             };
@@ -134,12 +150,12 @@ 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');
 
-                var html = '';
+            let html = '';
 
             html += globalize.translateHtml(template, 'core');
 
@@ -181,9 +197,8 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
             dialogHelper.open(dlg);
         });
     });
-    }
+}
 
-    return {
+export default {
     show: showEditor
-    };
+};
-});

src/components/recordingcreator/recordingeditor.js

@@ -1,42 +1,47 @@
-define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'connectionManager', 'require', 'loading', 'scrollHelper', 'imageLoader', 'scrollStyles', 'emby-button', 'emby-collapse', 'emby-input', 'paper-icon-button-light', 'css!./../formdialog', 'css!./recordingcreator', 'material-icons', 'flexStyles'], function (dialogHelper, globalize, layoutManager, mediaInfo, appHost, connectionManager, require, loading, scrollHelper, imageLoader) {
+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 'scrollStyles';
+import 'emby-button';
+import 'emby-collapse';
+import 'emby-input';
+import 'paper-icon-button-light';
+import 'css!./../formdialog';
+import 'css!./recordingcreator';
+import 'material-icons';
+import 'flexStyles';
 
-    scrollHelper = scrollHelper.default || scrollHelper;
+let currentDialog;
-    loading = loading.default || loading;
+let recordingDeleted = false;
+let currentItemId;
+let currentServerId;
+let currentResolve;
 
-    var currentDialog;
+function deleteTimer(apiClient, timerId) {
-    var recordingDeleted = false;
+    return import('recordingHelper').then(({ default: recordingHelper }) => {
-    var currentItemId;
+        recordingHelper.cancelTimerWithConfirmation(timerId, apiClient.serverId());
-    var currentServerId;
-    var currentResolve;
-
-    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);
     });
-        });
+}
-    }
 
-    function renderTimer(context, item, apiClient) {
+function renderTimer(context, item, apiClient) {
     context.querySelector('#txtPrePaddingMinutes').value = item.PrePaddingSeconds / 60;
     context.querySelector('#txtPostPaddingMinutes').value = item.PostPaddingSeconds / 60;
 
     loading.hide();
-    }
+}
 
-    function closeDialog(isDeleted) {
+function closeDialog(isDeleted) {
     recordingDeleted = isDeleted;
-
     dialogHelper.close(currentDialog);
-    }
+}
 
-    function onSubmit(e) {
+function onSubmit(e) {
-        var form = this;
+    const form = this;
 
-        var apiClient = connectionManager.getApiClient(currentServerId);
+    const apiClient = connectionManager.getApiClient(currentServerId);
 
     apiClient.getLiveTvTimer(currentItemId).then(function (item) {
         item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
@@ -48,35 +53,36 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
 
     // Disable default form submission
     return false;
-    }
+}
 
-    function init(context) {
+function init(context) {
     context.querySelector('.btnCancel').addEventListener('click', function () {
         closeDialog(false);
     });
 
     context.querySelector('.btnCancelRecording').addEventListener('click', function () {
-            var apiClient = connectionManager.getApiClient(currentServerId);
+        const apiClient = connectionManager.getApiClient(currentServerId);
+
         deleteTimer(apiClient, currentItemId).then(function () {
             closeDialog(true);
         });
     });
 
     context.querySelector('form').addEventListener('submit', onSubmit);
-    }
+}
 
-    function reload(context, id) {
+function reload(context, id) {
     loading.show();
     currentItemId = id;
 
-        var apiClient = connectionManager.getApiClient(currentServerId);
+    const apiClient = connectionManager.getApiClient(currentServerId);
     apiClient.getLiveTvTimer(id).then(function (result) {
         renderTimer(context, result, apiClient);
         loading.hide();
     });
-    }
+}
 
-    function showEditor(itemId, serverId, options) {
+function showEditor(itemId, serverId, options) {
     return new Promise(function (resolve, reject) {
         recordingDeleted = false;
         currentServerId = serverId;
@@ -84,8 +90,8 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
         options = options || {};
         currentResolve = resolve;
 
-            require(['text!./recordingeditor.template.html'], function (template) {
+        import('text!./recordingeditor.template.html').then(({default: template}) => {
-                var dialogOptions = {
+            const dialogOptions = {
                 removeOnClose: true,
                 scrollY: false
             };
@@ -94,7 +100,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
                 dialogOptions.size = 'fullscreen';
             }
 
-                var dlg = dialogHelper.createDialog(dialogOptions);
+            const dlg = dialogHelper.createDialog(dialogOptions);
 
             dlg.classList.add('formDialog');
             dlg.classList.add('recordingDialog');
@@ -104,7 +110,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
                 dlg.classList.add('dialog-fullscreen-lowres');
             }
 
-                var html = '';
+            let html = '';
 
             html += globalize.translateHtml(template, 'core');
 
@@ -142,9 +148,8 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
             dialogHelper.open(dlg);
         });
     });
-    }
+}
 
-    return {
+export default {
     show: showEditor
-    };
+};
-});

src/components/recordingcreator/recordingfields.js

@@ -1,11 +1,18 @@
-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) {
+import globalize from 'globalize';
-    'use strict';
+import connectionManager from 'connectionManager';
+import serverNotifications from 'serverNotifications';
+import loading from 'loading';
+import dom from 'dom';
+import recordingHelper from 'recordingHelper';
+import events from 'events';
+import 'paper-icon-button-light';
+import 'emby-button';
+import 'css!./recordingfields';
+import 'flexStyles';
 
-    serverNotifications = serverNotifications.default || serverNotifications;
+/*eslint prefer-const: "error"*/
-    recordingHelper = recordingHelper.default || recordingHelper;
-    loading = loading.default || loading;
 
-    function loadData(parent, program, apiClient) {
+function loadData(parent, program, apiClient) {
     if (program.IsSeries) {
         parent.querySelector('.recordSeriesContainer').classList.remove('hide');
     } else {
@@ -35,11 +42,11 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
         parent.querySelector('.singleRecordingButton .recordingIcon').classList.remove('recordingIcon-active');
         parent.querySelector('.singleRecordingButton .buttonText').innerHTML = globalize.translate('Record');
     }
-    }
+}
 
-    function fetchData(instance) {
+function fetchData(instance) {
-        var options = instance.options;
+    const options = instance.options;
-        var apiClient = connectionManager.getApiClient(options.serverId);
+    const apiClient = connectionManager.getApiClient(options.serverId);
 
     options.parent.querySelector('.recordingFields').classList.remove('hide');
     return apiClient.getLiveTvProgram(options.programId, apiClient.getCurrentUserId()).then(function (program) {
@@ -48,11 +55,11 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
         instance.SeriesTimerId = program.SeriesTimerId;
         loadData(options.parent, program, apiClient);
     });
-    }
+}
 
-    function onTimerChangedExternally(e, apiClient, data) {
+function onTimerChangedExternally(e, apiClient, data) {
-        var options = this.options;
+    const options = this.options;
-        var refresh = false;
+    let refresh = false;
 
     if (data.Id) {
         if (this.TimerId === data.Id) {
@@ -68,11 +75,11 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
     if (refresh) {
         this.refresh();
     }
-    }
+}
 
-    function onSeriesTimerChangedExternally(e, apiClient, data) {
+function onSeriesTimerChangedExternally(e, apiClient, data) {
-        var options = this.options;
+    const options = this.options;
-        var refresh = false;
+    let refresh = false;
 
     if (data.Id) {
         if (this.SeriesTimerId === data.Id) {
@@ -88,51 +95,93 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
     if (refresh) {
         this.refresh();
     }
-    }
+}
 
-    function RecordingEditor(options) {
+class RecordingEditor {
+    constructor(options) {
         this.options = options;
         this.embed();
 
-        var timerChangedHandler = onTimerChangedExternally.bind(this);
+        const timerChangedHandler = onTimerChangedExternally.bind(this);
         this.timerChangedHandler = timerChangedHandler;
 
         events.on(serverNotifications, 'TimerCreated', timerChangedHandler);
         events.on(serverNotifications, 'TimerCancelled', timerChangedHandler);
 
-        var seriesTimerChangedHandler = onSeriesTimerChangedExternally.bind(this);
+        const seriesTimerChangedHandler = onSeriesTimerChangedExternally.bind(this);
         this.seriesTimerChangedHandler = seriesTimerChangedHandler;
 
         events.on(serverNotifications, 'SeriesTimerCreated', seriesTimerChangedHandler);
         events.on(serverNotifications, 'SeriesTimerCancelled', seriesTimerChangedHandler);
     }
 
-    function onManageRecordingClick(e) {
+    embed() {
-        var options = this.options;
+        const self = this;
+        return new Promise(function (resolve, reject) {
+            import('text!./recordingfields.template.html').then(({default: template}) => {
+                const options = self.options;
+                const context = options.parent;
+                context.innerHTML = globalize.translateHtml(template, 'core');
+
+                context.querySelector('.singleRecordingButton').addEventListener('click', onRecordChange.bind(self));
+                context.querySelector('.seriesRecordingButton').addEventListener('click', onRecordSeriesChange.bind(self));
+                context.querySelector('.btnManageRecording').addEventListener('click', onManageRecordingClick.bind(self));
+                context.querySelector('.btnManageSeriesRecording').addEventListener('click', onManageSeriesRecordingClick.bind(self));
+
+                fetchData(self).then(resolve);
+            });
+        });
+    }
+
+    hasChanged() {
+        return this.changed;
+    }
+
+    refresh() {
+        fetchData(this);
+    }
+
+    destroy() {
+        const timerChangedHandler = this.timerChangedHandler;
+        this.timerChangedHandler = null;
+
+        events.off(serverNotifications, 'TimerCreated', timerChangedHandler);
+        events.off(serverNotifications, 'TimerCancelled', timerChangedHandler);
+
+        const seriesTimerChangedHandler = this.seriesTimerChangedHandler;
+        this.seriesTimerChangedHandler = null;
+
+        events.off(serverNotifications, 'SeriesTimerCreated', seriesTimerChangedHandler);
+        events.off(serverNotifications, 'SeriesTimerCancelled', seriesTimerChangedHandler);
+    }
+}
+
+function onManageRecordingClick(e) {
+    const options = this.options;
     if (!this.TimerId || this.Status === 'Cancelled') {
         return;
     }
 
-        var self = this;
+    const self = this;
-        require(['recordingEditor'], function (recordingEditor) {
+    import('recordingEditor').then(({default: recordingEditor}) => {
         recordingEditor.show(self.TimerId, options.serverId, {
             enableCancel: false
         }).then(function () {
             self.changed = true;
         });
     });
-    }
+}
 
-    function onManageSeriesRecordingClick(e) {
+function onManageSeriesRecordingClick(e) {
-        var options = this.options;
+    const options = this.options;
 
     if (!this.SeriesTimerId) {
         return;
     }
 
-        var self = this;
+    const self = this;
 
-        require(['seriesRecordingEditor'], function (seriesRecordingEditor) {
+    import('seriesRecordingEditor').then(({default: seriesRecordingEditor}) => {
         seriesRecordingEditor.show(self.SeriesTimerId, options.serverId, {
 
             enableCancel: false
@@ -141,19 +190,19 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
             self.changed = true;
         });
     });
-    }
+}
 
-    function onRecordChange(e) {
+function onRecordChange(e) {
     this.changed = true;
 
-        var self = this;
+    const self = this;
-        var options = this.options;
+    const options = this.options;
-        var apiClient = connectionManager.getApiClient(options.serverId);
+    const apiClient = connectionManager.getApiClient(options.serverId);
 
-        var button = dom.parentWithTag(e.target, 'BUTTON');
+    const button = dom.parentWithTag(e.target, 'BUTTON');
-        var isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');
+    const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');
 
-        var hasEnabledTimer = this.TimerId && this.Status !== 'Cancelled';
+    const hasEnabledTimer = this.TimerId && this.Status !== 'Cancelled';
 
     if (isChecked) {
         if (!hasEnabledTimer) {
@@ -174,28 +223,28 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
             });
         }
     }
-    }
+}
 
-    function sendToast(msg) {
+function sendToast(msg) {
-        require(['toast'], function (toast) {
+    import('toast').then(({default: toast}) => {
         toast(msg);
     });
-    }
+}
 
-    function onRecordSeriesChange(e) {
+function onRecordSeriesChange(e) {
     this.changed = true;
 
-        var self = this;
+    const self = this;
-        var options = this.options;
+    const options = this.options;
-        var apiClient = connectionManager.getApiClient(options.serverId);
+    const apiClient = connectionManager.getApiClient(options.serverId);
 
-        var button = dom.parentWithTag(e.target, 'BUTTON');
+    const button = dom.parentWithTag(e.target, 'BUTTON');
-        var isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');
+    const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');
 
     if (isChecked) {
         options.parent.querySelector('.recordSeriesContainer').classList.remove('hide');
         if (!this.SeriesTimerId) {
-                var promise = this.TimerId ?
+            const promise = this.TimerId ?
                 recordingHelper.changeRecordingToSeries(apiClient, this.TimerId, options.programId) :
                 recordingHelper.createRecording(apiClient, options.programId, true);
             promise.then(function () {
@@ -210,47 +259,6 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
             });
         }
     }
-    }
+}
 
-    RecordingEditor.prototype.embed = function () {
+export default RecordingEditor;
-        var self = this;
-        return new Promise(function (resolve, reject) {
-            require(['text!./recordingfields.template.html'], function (template) {
-                var options = self.options;
-                var context = options.parent;
-                context.innerHTML = globalize.translateHtml(template, 'core');
-
-                context.querySelector('.singleRecordingButton').addEventListener('click', onRecordChange.bind(self));
-                context.querySelector('.seriesRecordingButton').addEventListener('click', onRecordSeriesChange.bind(self));
-                context.querySelector('.btnManageRecording').addEventListener('click', onManageRecordingClick.bind(self));
-                context.querySelector('.btnManageSeriesRecording').addEventListener('click', onManageSeriesRecordingClick.bind(self));
-
-                fetchData(self).then(resolve);
-            });
-        });
-    };
-
-    RecordingEditor.prototype.hasChanged = function () {
-        return this.changed;
-    };
-
-    RecordingEditor.prototype.refresh = function () {
-        fetchData(this);
-    };
-
-    RecordingEditor.prototype.destroy = function () {
-        var timerChangedHandler = this.timerChangedHandler;
-        this.timerChangedHandler = null;
-
-        events.off(serverNotifications, 'TimerCreated', timerChangedHandler);
-        events.off(serverNotifications, 'TimerCancelled', timerChangedHandler);
-
-        var seriesTimerChangedHandler = this.seriesTimerChangedHandler;
-        this.seriesTimerChangedHandler = null;
-
-        events.off(serverNotifications, 'SeriesTimerCreated', seriesTimerChangedHandler);
-        events.off(serverNotifications, 'SeriesTimerCancelled', seriesTimerChangedHandler);
-    };
-
-    return RecordingEditor;
-});

src/components/remotecontrol/remotecontrol.js

@@ -1,16 +1,32 @@
-define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageLoader', 'playbackManager', 'nowPlayingHelper', 'events', 'connectionManager', 'apphost', 'globalize', 'layoutManager', 'userSettings', 'cardBuilder', 'itemContextMenu', 'cardStyle', 'emby-itemscontainer', 'css!./remotecontrol.css', 'emby-ratingbutton'], function (browser, datetime, backdrop, libraryBrowser, listView, imageLoader, playbackManager, nowPlayingHelper, events, connectionManager, appHost, globalize, layoutManager, userSettings, cardBuilder, itemContextMenu) {
+import datetime from 'datetime';
-    'use strict';
+import backdrop from 'backdrop';
+import listView from 'listView';
+import imageLoader from 'imageLoader';
+import playbackManager from 'playbackManager';
+import nowPlayingHelper from 'nowPlayingHelper';
+import events from 'events';
+import connectionManager from 'connectionManager';
+import appHost from 'apphost';
+import globalize from 'globalize';
+import layoutManager from 'layoutManager';
+import * as userSettings from 'userSettings';
+import cardBuilder from 'cardBuilder';
+import itemContextMenu from 'itemContextMenu';
+import 'cardStyle';
+import 'emby-itemscontainer';
+import 'css!./remotecontrol.css';
+import 'emby-ratingbutton';
 
-    playbackManager = playbackManager.default || playbackManager;
+/*eslint prefer-const: "error"*/
 
-    var showMuteButton = true;
+let showMuteButton = true;
-    var showVolumeSlider = true;
+let showVolumeSlider = true;
 
-    function showAudioMenu(context, player, button, item) {
+function showAudioMenu(context, player, button, item) {
-        var currentIndex = playbackManager.getAudioStreamIndex(player);
+    const currentIndex = playbackManager.getAudioStreamIndex(player);
-        var streams = playbackManager.audioTracks(player);
+    const streams = playbackManager.audioTracks(player);
-        var menuItems = streams.map(function (s) {
+    const menuItems = streams.map(function (s) {
-            var menuItem = {
+        const menuItem = {
             name: s.DisplayTitle,
             id: s.Index
         };
@@ -22,7 +38,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         return menuItem;
     });
 
-        require(['actionsheet'], function (actionsheet) {
+    import('actionsheet').then(({ default: actionsheet }) => {
         actionsheet.show({
             items: menuItems,
             positionTo: button,
@@ -31,13 +47,13 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             }
         });
     });
-    }
+}
 
-    function showSubtitleMenu(context, player, button, item) {
+function showSubtitleMenu(context, player, button, item) {
-        var currentIndex = playbackManager.getSubtitleStreamIndex(player);
+    const currentIndex = playbackManager.getSubtitleStreamIndex(player);
-        var streams = playbackManager.subtitleTracks(player);
+    const streams = playbackManager.subtitleTracks(player);
-        var menuItems = streams.map(function (s) {
+    const menuItems = streams.map(function (s) {
-            var menuItem = {
+        const menuItem = {
             name: s.DisplayTitle,
             id: s.Index
         };
@@ -54,7 +70,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         selected: currentIndex == null
     });
 
-        require(['actionsheet'], function (actionsheet) {
+    import('actionsheet').then(({ default: actionsheet }) => {
         actionsheet.show({
             items: menuItems,
             positionTo: button,
@@ -63,15 +79,15 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             }
         });
     });
-    }
+}
 
-    function getNowPlayingNameHtml(nowPlayingItem, includeNonNameInfo) {
+function getNowPlayingNameHtml(nowPlayingItem, includeNonNameInfo) {
     return nowPlayingHelper.getNowPlayingNames(nowPlayingItem, includeNonNameInfo).map(function (i) {
         return i.text;
     }).join('<br/>');
-    }
+}
 
-    function seriesImageUrl(item, options) {
+function seriesImageUrl(item, options) {
     if (item.Type !== 'Episode') {
         return null;
     }
@@ -96,9 +112,9 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     return null;
-    }
+}
 
-    function imageUrl(item, options) {
+function imageUrl(item, options) {
     options = options || {};
     options.type = options.type || 'Primary';
 
@@ -113,22 +129,22 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     return null;
-    }
+}
 
-    function updateNowPlayingInfo(context, state, serverId) {
+function updateNowPlayingInfo(context, state, serverId) {
-        var item = state.NowPlayingItem;
+    const item = state.NowPlayingItem;
-        var displayName = item ? getNowPlayingNameHtml(item).replace('<br/>', ' - ') : '';
+    const displayName = item ? getNowPlayingNameHtml(item).replace('<br/>', ' - ') : '';
     if (typeof item !== 'undefined') {
-            var nowPlayingServerId = (item.ServerId || serverId);
+        const nowPlayingServerId = (item.ServerId || serverId);
         if (item.Type == 'Audio' || item.MediaStreams[0].Type == 'Audio') {
-                var songName = item.Name;
+            const songName = item.Name;
-                var artistsSeries = '';
+            let artistsSeries = '';
-                var albumName = '';
+            let albumName = '';
             if (item.Artists != null) {
                 if (item.ArtistItems != null) {
                     for (const artist of item.ArtistItems) {
-                            let artistName = artist.Name;
+                        const artistName = artist.Name;
-                            let artistId = artist.Id;
+                        const artistId = artist.Id;
                         artistsSeries += `<a class="button-link emby-button" is="emby-linkbutton" href="details?id=${artistId}&serverId=${nowPlayingServerId}">${artistName}</a>`;
                         if (artist !== item.ArtistItems.slice(-1)[0]) {
                             artistsSeries += ', ';
@@ -154,11 +170,11 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             context.querySelector('.nowPlayingSongName').innerHTML = songName;
         } else if (item.Type == 'Episode') {
             if (item.SeasonName != null) {
-                    var seasonName = item.SeasonName;
+                const seasonName = item.SeasonName;
                 context.querySelector('.nowPlayingSeason').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="details?id=' + item.SeasonId + `&serverId=${nowPlayingServerId}">${seasonName}</a>`;
             }
             if (item.SeriesName != null) {
-                    var seriesName = item.SeriesName;
+                const seriesName = item.SeriesName;
                 if (item.SeriesId != null) {
                     context.querySelector('.nowPlayingSerie').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="details?id=' + item.SeriesId + `&serverId=${nowPlayingServerId}">${seriesName}</a>`;
                 } else {
@@ -176,7 +192,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             context.querySelector('.nowPlayingPageTitle').classList.add('hide');
         }
 
-            var url = item ? seriesImageUrl(item, {
+        const url = item ? seriesImageUrl(item, {
             maxHeight: 300
         }) || imageUrl(item, {
             maxHeight: 300
@@ -185,14 +201,14 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         let contextButton = context.querySelector('.btnToggleContextMenu');
         // We remove the previous event listener by replacing the item in each update event
         const autoFocusContextButton = document.activeElement === contextButton;
-            let contextButtonClone = contextButton.cloneNode(true);
+        const contextButtonClone = contextButton.cloneNode(true);
         contextButton.parentNode.replaceChild(contextButtonClone, contextButton);
         contextButton = context.querySelector('.btnToggleContextMenu');
         if (autoFocusContextButton) {
             contextButton.focus();
         }
         const stopPlayback = !!layoutManager.mobile;
-            var options = {
+        const options = {
             play: false,
             queue: false,
             stopPlayback: stopPlayback,
@@ -200,7 +216,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             openAlbum: false,
             positionTo: contextButton
         };
-            var apiClient = connectionManager.getApiClient(item.ServerId);
+        const apiClient = connectionManager.getApiClient(item.ServerId);
         apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) {
             apiClient.getCurrentUser().then(function (user) {
                 contextButton.addEventListener('click', function () {
@@ -215,8 +231,8 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         if (item) {
             backdrop.setBackdrops([item]);
             apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) {
-                    var userData = fullItem.UserData || {};
+                const userData = fullItem.UserData || {};
-                    var likes = userData.Likes == null ? '' : userData.Likes;
+                const likes = userData.Likes == null ? '' : userData.Likes;
                 context.querySelector('.nowPlayingPageUserDataButtonsTitle').innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + fullItem.Id + '" data-serverid="' + fullItem.ServerId + '" data-itemtype="' + fullItem.Type + '" data-likes="' + likes + '" data-isfavorite="' + userData.IsFavorite + '"><span class="material-icons favorite"></span></button>';
                 context.querySelector('.nowPlayingPageUserDataButtons').innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + fullItem.Id + '" data-serverid="' + fullItem.ServerId + '" data-itemtype="' + fullItem.Type + '" data-likes="' + likes + '" data-isfavorite="' + userData.IsFavorite + '"><span class="material-icons favorite"></span></button>';
             });
@@ -225,11 +241,11 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             context.querySelector('.nowPlayingPageUserDataButtons').innerHTML = '';
         }
     }
-    }
+}
 
-    function setImageUrl(context, state, url) {
+function setImageUrl(context, state, url) {
-        var item = state.NowPlayingItem;
+    const item = state.NowPlayingItem;
-        var imgContainer = context.querySelector('.nowPlayingPageImageContainer');
+    const imgContainer = context.querySelector('.nowPlayingPageImageContainer');
 
     if (url) {
         imgContainer.innerHTML = '<img class="nowPlayingPageImage" src="' + url + '" />';
@@ -243,26 +259,26 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     } else {
         imgContainer.innerHTML = '<div class="nowPlayingPageImageContainerNoAlbum"><button data-action="link" class="cardImageContainer coveredImage ' + cardBuilder.getDefaultBackgroundClass(item.Name) + ' cardContent cardContent-shadow itemAction"><span class="cardImageIcon material-icons album"></span></button></div>';
     }
-    }
+}
 
-    function buttonVisible(btn, enabled) {
+function buttonVisible(btn, enabled) {
     if (enabled) {
         btn.classList.remove('hide');
     } else {
         btn.classList.add('hide');
     }
-    }
+}
 
-    function updateSupportedCommands(context, commands) {
+function updateSupportedCommands(context, commands) {
-        var all = context.querySelectorAll('.btnCommand');
+    const all = context.querySelectorAll('.btnCommand');
 
-        for (var i = 0, length = all.length; i < length; i++) {
+    for (let i = 0, length = all.length; i < length; i++) {
-            var enableButton = commands.indexOf(all[i].getAttribute('data-command')) !== -1;
+        const enableButton = commands.indexOf(all[i].getAttribute('data-command')) !== -1;
         all[i].disabled = !enableButton;
     }
-    }
+}
 
-    return function () {
+export default function () {
     function toggleRepeat() {
         switch (playbackManager.getRepeatMode()) {
             case 'RepeatAll':
@@ -278,12 +294,12 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
 
     function updatePlayerState(player, context, state) {
         lastPlayerState = state;
-            var item = state.NowPlayingItem;
+        const item = state.NowPlayingItem;
-            var playerInfo = playbackManager.getPlayerInfo();
+        const playerInfo = playbackManager.getPlayerInfo();
-            var supportedCommands = playerInfo.supportedCommands;
+        const supportedCommands = playerInfo.supportedCommands;
         currentPlayerSupportedCommands = supportedCommands;
-            var playState = state.PlayState || {};
+        const playState = state.PlayState || {};
-            var isSupportedCommands = supportedCommands.includes('DisplayMessage') || supportedCommands.includes('SendString') || supportedCommands.includes('Select');
+        const isSupportedCommands = supportedCommands.includes('DisplayMessage') || supportedCommands.includes('SendString') || supportedCommands.includes('Select');
         buttonVisible(context.querySelector('.btnToggleFullscreen'), item && item.MediaType == 'Video' && supportedCommands.includes('ToggleFullscreen'));
         updateAudioTracksDisplay(player, context);
         updateSubtitleTracksDisplay(player, context);
@@ -322,7 +338,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             buttonVisible(context.querySelector('.btnRewind'), item != null);
             buttonVisible(context.querySelector('.btnFastForward'), item != null);
         }
-            var positionSlider = context.querySelector('.nowPlayingPositionSlider');
+        const positionSlider = context.querySelector('.nowPlayingPositionSlider');
 
         if (positionSlider && item && item.RunTimeTicks) {
             positionSlider.setKeyboardSteps(userSettings.skipBackLength() * 1000000 / item.RunTimeTicks,
@@ -331,7 +347,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
 
         if (positionSlider && !positionSlider.dragging) {
             positionSlider.disabled = !playState.CanSeek;
-                var isProgressClear = state.MediaSource && state.MediaSource.RunTimeTicks == null;
+            const isProgressClear = state.MediaSource && state.MediaSource.RunTimeTicks == null;
             positionSlider.setIsClear(isProgressClear);
         }
 
@@ -351,18 +367,18 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     function updateAudioTracksDisplay(player, context) {
-            var supportedCommands = currentPlayerSupportedCommands;
+        const supportedCommands = currentPlayerSupportedCommands;
         buttonVisible(context.querySelector('.btnAudioTracks'), playbackManager.audioTracks(player).length > 1 && supportedCommands.indexOf('SetAudioStreamIndex') != -1);
     }
 
     function updateSubtitleTracksDisplay(player, context) {
-            var supportedCommands = currentPlayerSupportedCommands;
+        const supportedCommands = currentPlayerSupportedCommands;
         buttonVisible(context.querySelector('.btnSubtitles'), playbackManager.subtitleTracks(player).length && supportedCommands.indexOf('SetSubtitleStreamIndex') != -1);
     }
 
     function updateRepeatModeDisplay(repeatMode) {
-            var context = dlg;
+        const context = dlg;
-            let toggleRepeatButtons = context.querySelectorAll('.repeatToggleButton');
+        const toggleRepeatButtons = context.querySelectorAll('.repeatToggleButton');
         const cssClass = 'buttonActive';
         let innHtml = '<span class="material-icons repeat"></span>';
         let repeatOn = true;
@@ -386,8 +402,8 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     function updatePlayerVolumeState(context, isMuted, volumeLevel) {
-            var view = context;
+        const view = context;
-            var supportedCommands = currentPlayerSupportedCommands;
+        const supportedCommands = currentPlayerSupportedCommands;
 
         if (supportedCommands.indexOf('Mute') === -1) {
             showMuteButton = false;
@@ -420,8 +436,8 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         } else {
             buttonMute.classList.toggle('hide', !showMuteButton);
 
-                var nowPlayingVolumeSlider = context.querySelector('.nowPlayingVolumeSlider');
+            const nowPlayingVolumeSlider = context.querySelector('.nowPlayingVolumeSlider');
-                var nowPlayingVolumeSliderContainer = context.querySelector('.nowPlayingVolumeSliderContainer');
+            const nowPlayingVolumeSliderContainer = context.querySelector('.nowPlayingVolumeSliderContainer');
 
             if (nowPlayingVolumeSlider) {
                 nowPlayingVolumeSliderContainer.classList.toggle('hide', !showVolumeSlider);
@@ -434,8 +450,8 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     function updatePlayPauseState(isPaused, isActive) {
-            var context = dlg;
+        const context = dlg;
-            var btnPlayPause = context.querySelector('.btnPlayPause');
+        const btnPlayPause = context.querySelector('.btnPlayPause');
         const btnPlayPauseIcon = btnPlayPause.querySelector('.material-icons');
 
         btnPlayPauseIcon.classList.remove('play_circle_filled', 'pause_circle_filled');
@@ -445,12 +461,12 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     function updateTimeDisplay(positionTicks, runtimeTicks) {
-            var context = dlg;
+        const context = dlg;
-            var positionSlider = context.querySelector('.nowPlayingPositionSlider');
+        const positionSlider = context.querySelector('.nowPlayingPositionSlider');
 
         if (positionSlider && !positionSlider.dragging) {
             if (runtimeTicks) {
-                    var pct = positionTicks / runtimeTicks;
+                let pct = positionTicks / runtimeTicks;
                 pct *= 100;
                 positionSlider.value = pct;
             } else {
@@ -468,7 +484,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
 
     function loadPlaylist(context, player) {
         getPlaylistItems(player).then(function (items) {
-                var html = '';
+            let html = '';
             let favoritesEnabled = true;
             if (layoutManager.mobile) {
                 if (items.length > 0) {
@@ -492,7 +508,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 dragHandle: true
             });
 
-                var itemsContainer = context.querySelector('.playlist');
+            const itemsContainer = context.querySelector('.playlist');
             let focusedItemPlaylistId = itemsContainer.querySelector('button:focus');
             itemsContainer.innerHTML = html;
             if (focusedItemPlaylistId !== null) {
@@ -503,10 +519,10 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 }
             }
 
-                var playlistItemId = playbackManager.getCurrentPlaylistItemId(player);
+            const playlistItemId = playbackManager.getCurrentPlaylistItemId(player);
 
             if (playlistItemId) {
-                    var img = itemsContainer.querySelector(`.listItem[data-playlistItemId="${playlistItemId}"] .listItemImage`);
+                const img = itemsContainer.querySelector(`.listItem[data-playlistItemId="${playlistItemId}"] .listItemImage`);
 
                 if (img) {
                     img.classList.remove('lazy');
@@ -520,7 +536,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
 
     function onPlaybackStart(e, state) {
         console.debug('remotecontrol event: ' + e.type);
-            var player = this;
+        const player = this;
         onStateChanged.call(player, e, state);
     }
 
@@ -529,12 +545,12 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     function onShuffleQueueModeChange(updateView = true) {
-            let shuffleMode = playbackManager.getQueueShuffleMode(this);
+        const shuffleMode = playbackManager.getQueueShuffleMode(this);
-            let context = dlg;
+        const context = dlg;
         const cssClass = 'buttonActive';
-            let shuffleButtons = context.querySelectorAll('.btnShuffleQueue');
+        const shuffleButtons = context.querySelectorAll('.btnShuffleQueue');
 
-            for (let shuffleButton of shuffleButtons) {
+        for (const shuffleButton of shuffleButtons) {
             switch (shuffleMode) {
                 case 'Shuffle':
                     shuffleButton.classList.add(cssClass);
@@ -556,12 +572,12 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     function onPlaylistItemRemoved(e, info) {
-            var context = dlg;
+        const context = dlg;
         if (info !== undefined) {
-                var playlistItemIds = info.playlistItemIds;
+            const playlistItemIds = info.playlistItemIds;
 
-                for (var i = 0, length = playlistItemIds.length; i < length; i++) {
+            for (let i = 0, length = playlistItemIds.length; i < length; i++) {
-                    var listItem = context.querySelector('.listItem[data-playlistItemId="' + playlistItemIds[i] + '"]');
+                const listItem = context.querySelector('.listItem[data-playlistItemId="' + playlistItemIds[i] + '"]');
 
                 if (listItem) {
                     listItem.parentNode.removeChild(listItem);
@@ -574,7 +590,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
 
     function onPlaybackStopped(e, state) {
         console.debug('remotecontrol event: ' + e.type);
-            var player = this;
+        const player = this;
 
         if (!state.NextMediaType) {
             updatePlayerState(player, dlg, {});
@@ -587,29 +603,29 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     function onStateChanged(event, state) {
-            var player = this;
+        const player = this;
         updatePlayerState(player, dlg, state);
         onPlaylistUpdate();
     }
 
     function onTimeUpdate(e) {
-            var now = new Date().getTime();
+        const now = new Date().getTime();
 
         if (!(now - lastUpdateTime < 700)) {
             lastUpdateTime = now;
-                var player = this;
+            const player = this;
             currentRuntimeTicks = playbackManager.duration(player);
             updateTimeDisplay(playbackManager.currentTime(player), currentRuntimeTicks);
         }
     }
 
     function onVolumeChanged(e) {
-            var player = this;
+        const player = this;
         updatePlayerVolumeState(dlg, player.isMuted(), player.getVolume());
     }
 
     function releaseCurrentPlayer() {
-            var player = currentPlayer;
+        const player = currentPlayer;
 
         if (player) {
             events.off(player, 'playbackstart', onPlaybackStart);
@@ -630,7 +646,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
 
     function bindToPlayer(context, player) {
         if (releaseCurrentPlayer(), currentPlayer = player, player) {
-                var state = playbackManager.getPlayerState(player);
+            const state = playbackManager.getPlayerState(player);
             onStateChanged.call(player, {
                 type: 'init'
             }, state);
@@ -646,8 +662,8 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             events.on(player, 'pause', onPlayPauseStateChanged);
             events.on(player, 'unpause', onPlayPauseStateChanged);
             events.on(player, 'timeupdate', onTimeUpdate);
-                var playerInfo = playbackManager.getPlayerInfo();
+            const playerInfo = playbackManager.getPlayerInfo();
-                var supportedCommands = playerInfo.supportedCommands;
+            const supportedCommands = playerInfo.supportedCommands;
             currentPlayerSupportedCommands = supportedCommands;
             updateSupportedCommands(context, supportedCommands);
         }
@@ -674,10 +690,10 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     function savePlaylist() {
-            require(['playlistEditor'], function (playlistEditor) {
+        import('playlistEditor').then(({ default: playlistEditor }) => {
             getSaveablePlaylistItems().then(function (items) {
-                    var serverId = items.length ? items[0].ServerId : ApiClient.serverId();
+                const serverId = items.length ? items[0].ServerId : ApiClient.serverId();
-                    new playlistEditor.showEditor({
+                new playlistEditor({
                     items: items.map(function (i) {
                         return i.Id;
                     }),
@@ -690,10 +706,10 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     function bindEvents(context) {
-            var btnCommand = context.querySelectorAll('.btnCommand');
+        const btnCommand = context.querySelectorAll('.btnCommand');
-            var positionSlider = context.querySelector('.nowPlayingPositionSlider');
+        const positionSlider = context.querySelector('.nowPlayingPositionSlider');
 
-            for (var i = 0, length = btnCommand.length; i < length; i++) {
+        for (let i = 0, length = btnCommand.length; i < length; i++) {
             btnCommand[i].addEventListener('click', onBtnCommandClick);
         }
 
@@ -770,22 +786,22 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             }
         });
         positionSlider.addEventListener('change', function () {
-                var value = this.value;
+            const value = this.value;
 
             if (currentPlayer) {
-                    var newPercent = parseFloat(value);
+                const newPercent = parseFloat(value);
                 playbackManager.seekPercent(newPercent, currentPlayer);
             }
         });
 
         positionSlider.getBubbleText = function (value) {
-                var state = lastPlayerState;
+            const state = lastPlayerState;
 
             if (!state || !state.NowPlayingItem || !currentRuntimeTicks) {
                 return '--:--';
             }
 
-                var ticks = currentRuntimeTicks;
+            let ticks = currentRuntimeTicks;
             ticks /= 100;
             ticks *= value;
             return datetime.getDisplayRunningTime(ticks);
@@ -798,13 +814,13 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         context.querySelector('.buttonMute').addEventListener('click', function () {
             playbackManager.toggleMute(currentPlayer);
         });
-            var playlistContainer = context.querySelector('.playlist');
+        const playlistContainer = context.querySelector('.playlist');
         playlistContainer.addEventListener('action-remove', function (e) {
             playbackManager.removeFromPlaylist([e.detail.playlistItemId], currentPlayer);
         });
         playlistContainer.addEventListener('itemdrop', function (e) {
-                var newIndex = e.detail.newIndex;
+            const newIndex = e.detail.newIndex;
-                var playlistItemId = e.detail.playlistItemId;
+            const playlistItemId = e.detail.playlistItemId;
             playbackManager.movePlaylistItem(playlistItemId, newIndex, currentPlayer);
         });
         context.querySelector('.btnSavePlaylist').addEventListener('click', savePlaylist);
@@ -834,7 +850,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     function onMessageSubmit(e) {
-            var form = e.target;
+        const form = e.target;
         playbackManager.sendCommand({
             Name: 'DisplayMessage',
             Arguments: {
@@ -844,7 +860,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         }, currentPlayer);
         form.querySelector('input').value = '';
 
-            require(['toast'], function (toast) {
+        import('toast').then(({ default: toast }) => {
             toast('Message sent.');
         });
 
@@ -854,7 +870,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     function onSendStringSubmit(e) {
-            var form = e.target;
+        const form = e.target;
         playbackManager.sendCommand({
             Name: 'SendString',
             Arguments: {
@@ -863,7 +879,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         }, currentPlayer);
         form.querySelector('input').value = '';
 
-            require(['toast'], function (toast) {
+        import('toast').then(({ default: toast }) => {
             toast('Text sent.');
         });
 
@@ -877,7 +893,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         volumecontrolHtml += `<button is="paper-icon-button-light" class="buttonMute autoSize" title=${globalize.translate('Mute')}><span class="xlargePaperIconButton material-icons volume_up"></span></button>`;
         volumecontrolHtml += '<div class="sliderContainer nowPlayingVolumeSliderContainer"><input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="nowPlayingVolumeSlider"/></div>';
         volumecontrolHtml += '</div>';
-            let optionsSection = context.querySelector('.playlistSectionButton');
+        const optionsSection = context.querySelector('.playlistSectionButton');
         if (!layoutManager.mobile) {
             context.querySelector('.nowPlayingSecondaryButtons').insertAdjacentHTML('beforeend', volumecontrolHtml);
             optionsSection.classList.remove('align-items-center', 'justify-content-center');
@@ -899,7 +915,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         events.on(playbackManager, 'playerchange', onPlayerChange);
 
         if (layoutManager.tv) {
-                var positionSlider = context.querySelector('.nowPlayingPositionSlider');
+            const positionSlider = context.querySelector('.nowPlayingPositionSlider');
             positionSlider.classList.add('focusable');
             positionSlider.enableKeyboardDragging();
         }
@@ -915,13 +931,13 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         bindToPlayer(context, playbackManager.getCurrentPlayer());
     }
 
-        var dlg;
+    let dlg;
-        var currentPlayer;
+    let currentPlayer;
-        var lastPlayerState;
+    let lastPlayerState;
-        var currentPlayerSupportedCommands = [];
+    let currentPlayerSupportedCommands = [];
-        var lastUpdateTime = 0;
+    let lastUpdateTime = 0;
-        var currentRuntimeTicks = 0;
+    let currentRuntimeTicks = 0;
-        var self = this;
+    const self = this;
 
     self.init = function (ownerView, context) {
         dlg = context;
@@ -935,5 +951,4 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     self.destroy = function () {
         onDialogClosed();
     };
-    };
+}
-});

src/components/scrollManager.js

@@ -251,7 +251,7 @@ import layoutManager from 'layoutManager';
      * @return {ScrollerData} Scroller data.
      */
     function getScrollerData(scroller, vertical) {
-        let data = {};
+        const data = {};
 
         if (!vertical) {
             data.scrollPos = scroller.scrollLeft;

src/components/slideshow/slideshow.js

@@ -2,31 +2,37 @@
  * Image viewer component
  * @module components/slideshow/slideshow
  */
-define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'focusManager', 'browser', 'apphost', 'dom', 'css!./style', 'material-icons', 'paper-icon-button-light'], function (dialogHelper, inputManager, connectionManager, layoutManager, focusManager, browser, appHost, dom) {
+import dialogHelper from 'dialogHelper';
-    'use strict';
+import inputManager from 'inputManager';
+import connectionManager from 'connectionManager';
+import layoutManager from 'layoutManager';
+import focusManager from 'focusManager';
+import browser from 'browser';
+import appHost from 'apphost';
+import dom from 'dom';
+import 'css!./style';
+import 'material-icons';
+import 'paper-icon-button-light';
 
-    browser = browser.default || browser;
+/**
-    focusManager = focusManager.default || focusManager;
-
-    /**
  * Name of transition event.
  */
-    const transitionEndEventName = dom.whichTransitionEvent();
+const transitionEndEventName = dom.whichTransitionEvent();
 
-    /**
+/**
  * Flag to use fake image to fix blurry zoomed image.
  * At least WebKit doesn't restore quality for zoomed images.
  */
-    const useFakeZoomImage = browser.safari;
+const useFakeZoomImage = browser.safari;
 
-    /**
+/**
  * Retrieves an item's image URL from the API.
  * @param {object|string} item - Item used to generate the image URL.
  * @param {object} options - Options of the image.
  * @param {object} apiClient - API client instance used to retrieve the image.
  * @returns {null|string} URL of the item's image.
  */
-    function getImageUrl(item, options, apiClient) {
+function getImageUrl(item, options, apiClient) {
     options = options || {};
     options.type = options.type || 'Primary';
 
@@ -47,16 +53,16 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
     }
 
     return null;
-    }
+}
 
-    /**
+/**
  * Retrieves a backdrop's image URL from the API.
  * @param {object} item - Item used to generate the image URL.
  * @param {object} options - Options of the image.
  * @param {object} apiClient - API client instance used to retrieve the image.
  * @returns {null|string} URL of the item's backdrop.
  */
-    function getBackdropImageUrl(item, options, apiClient) {
+function getBackdropImageUrl(item, options, apiClient) {
     options = options || {};
     options.type = options.type || 'Backdrop';
 
@@ -71,16 +77,16 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
     }
 
     return null;
-    }
+}
 
-    /**
+/**
  * Dispatches a request for an item's image to its respective handler.
  * @param {object} item - Item used to generate the image URL.
  * @returns {string} URL of the item's image.
  */
-    function getImgUrl(item, user) {
+function getImgUrl(item, user) {
-        var apiClient = connectionManager.getApiClient(item.ServerId);
+    const apiClient = connectionManager.getApiClient(item.ServerId);
-        var imageOptions = {};
+    const imageOptions = {};
 
     if (item.BackdropImageTags && item.BackdropImageTags.length) {
         return getBackdropImageUrl(item, imageOptions, apiClient);
@@ -91,9 +97,9 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
         imageOptions.type = 'Primary';
         return getImageUrl(item, imageOptions, apiClient);
     }
-    }
+}
 
-    /**
+/**
  * Generates a button using the specified icon, classes and properties.
  * @param {string} icon - Name of the material icon on the button
  * @param {string} cssClass - CSS classes to assign to the button
@@ -101,36 +107,36 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
  * @param {boolean} autoFocus - Flag to set the autofocus attribute on the button.
  * @returns {string} The HTML markup of the button.
  */
-    function getIcon(icon, cssClass, canFocus, autoFocus) {
+function getIcon(icon, cssClass, canFocus, autoFocus) {
-        var tabIndex = canFocus ? '' : ' tabindex="-1"';
+    const tabIndex = canFocus ? '' : ' tabindex="-1"';
     autoFocus = autoFocus ? ' autofocus' : '';
     return '<button is="paper-icon-button-light" class="autoSize ' + cssClass + '"' + tabIndex + autoFocus + '><span class="material-icons slideshowButtonIcon ' + icon + '"></span></button>';
-    }
+}
 
-    /**
+/**
  * Sets the viewport meta tag to enable or disable scaling by the user.
  * @param {boolean} scalable - Flag to set the scalability of the viewport.
  */
-    function setUserScalable(scalable) {
+function setUserScalable(scalable) {
     try {
         appHost.setUserScalable(scalable);
     } catch (err) {
         console.error('error in appHost.setUserScalable: ' + err);
     }
-    }
+}
 
-    return function (options) {
+export default function (options) {
-        var self = this;
+    const self = this;
     /** Initialized instance of Swiper. */
-        var swiperInstance;
+    let swiperInstance;
     /** Initialized instance of the dialog containing the Swiper instance. */
-        var dialog;
+    let dialog;
     /** Options of the slideshow components */
-        var currentOptions;
+    let currentOptions;
     /** ID of the timeout used to hide the OSD. */
-        var hideTimeout;
+    let hideTimeout;
     /** Last coordinates of the mouse pointer. */
-        var lastMouseMoveData;
+    let lastMouseMoveData;
 
     /**
      * Creates the HTML markup for the dialog and the OSD.
@@ -150,12 +156,12 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
 
         dialog.classList.add('slideshowDialog');
 
-            var html = '';
+        let html = '';
 
         html += '<div class="slideshowSwiperContainer"><div class="swiper-wrapper"></div></div>';
 
         if (options.interactive && !layoutManager.tv) {
-                var actionButtonsOnTop = layoutManager.mobile;
+            const actionButtonsOnTop = layoutManager.mobile;
 
             html += getIcon('keyboard_arrow_left', 'btnSlideshowPrevious slideshowButton hide-mouse-idle-tv', false);
             html += getIcon('keyboard_arrow_right', 'btnSlideshowNext slideshowButton hide-mouse-idle-tv', false);
@@ -196,17 +202,17 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
                 dialogHelper.close(dialog);
             });
 
-                var btnPause = dialog.querySelector('.btnSlideshowPause');
+            const btnPause = dialog.querySelector('.btnSlideshowPause');
             if (btnPause) {
                 btnPause.addEventListener('click', playPause);
             }
 
-                var btnDownload = dialog.querySelector('.btnDownload');
+            const btnDownload = dialog.querySelector('.btnDownload');
             if (btnDownload) {
                 btnDownload.addEventListener('click', download);
             }
 
-                var btnShare = dialog.querySelector('.btnShare');
+            const btnShare = dialog.querySelector('.btnShare');
             if (btnShare) {
                 btnShare.addEventListener('click', share);
             }
@@ -231,7 +237,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
      * Handles OSD changes when the autoplay is started.
      */
     function onAutoplayStart() {
-            var btnSlideshowPause = dialog.querySelector('.btnSlideshowPause .material-icons');
+        const btnSlideshowPause = dialog.querySelector('.btnSlideshowPause .material-icons');
         if (btnSlideshowPause) {
             btnSlideshowPause.classList.replace('play_arrow', 'pause');
         }
@@ -241,7 +247,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
      * Handles OSD changes when the autoplay is stopped.
      */
     function onAutoplayStop() {
-            var btnSlideshowPause = dialog.querySelector('.btnSlideshowPause .material-icons');
+        const btnSlideshowPause = dialog.querySelector('.btnSlideshowPause .material-icons');
         if (btnSlideshowPause) {
             btnSlideshowPause.classList.replace('pause', 'play_arrow');
         }
@@ -288,14 +294,14 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
      * @param {Object} options - Options used to initialize the Swiper instance.
      */
     function loadSwiper(dialog, options) {
-            var slides;
+        let slides;
         if (currentOptions.slides) {
             slides = currentOptions.slides;
         } else {
             slides = currentOptions.items;
         }
 
-            require(['swiper'], function (Swiper) {
+        import('swiper').then(({default: Swiper}) => {
             swiperInstance = new Swiper(dialog.querySelector('.slideshowSwiperContainer'), {
                 direction: 'horizontal',
                 // Loop is disabled due to the virtual slides option not supporting it.
@@ -369,7 +375,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
      * @returns {string} The HTML markup of the slide.
      */
     function getSwiperSlideHtmlFromSlide(item) {
-            var html = '';
+        let html = '';
         html += '<div class="swiper-slide" data-original="' + item.originalImage + '" data-itemid="' + item.Id + '" data-serverid="' + item.ServerId + '">';
         html += '<div class="swiper-zoom-container">';
         if (useFakeZoomImage) {
@@ -404,7 +410,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
      */
     function getCurrentImageInfo() {
         if (swiperInstance) {
-                var slide = document.querySelector('.swiper-slide-active');
+            const slide = document.querySelector('.swiper-slide-active');
 
             if (slide) {
                 return {
@@ -424,9 +430,9 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
      * Starts a download for the currently displayed slide.
      */
     function download() {
-            var imageInfo = getCurrentImageInfo();
+        const imageInfo = getCurrentImageInfo();
 
-            require(['fileDownloader'], function (fileDownloader) {
+        import('fileDownloader').then(({default: fileDownloader}) => {
             fileDownloader.download([imageInfo]);
         });
     }
@@ -435,7 +441,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
      * Shares the currently displayed slide using the browser's built-in sharing feature.
      */
     function share() {
-            var imageInfo = getCurrentImageInfo();
+        const imageInfo = getCurrentImageInfo();
 
         navigator.share({
             url: imageInfo.shareUrl
@@ -464,7 +470,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
      * Toggles the autoplay feature of the Swiper instance.
      */
     function playPause() {
-            var paused = !dialog.querySelector('.btnSlideshowPause .material-icons').classList.contains('pause');
+        const paused = !dialog.querySelector('.btnSlideshowPause .material-icons').classList.contains('pause');
         if (paused) {
             play();
         } else {
@@ -476,7 +482,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
      * Closes the dialog and destroys the Swiper instance.
      */
     function onDialogClosed() {
-            var swiper = swiperInstance;
+        const swiper = swiperInstance;
         if (swiper) {
             swiper.destroy(true, true);
             swiperInstance = null;
@@ -494,7 +500,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
      * Shows the OSD.
      */
     function showOsd() {
-            var bottom = dialog.querySelector('.slideshowBottomBar');
+        const bottom = dialog.querySelector('.slideshowBottomBar');
         if (bottom) {
             slideUpToShow(bottom);
             startHideTimer();
@@ -505,7 +511,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
      * Hides the OSD.
      */
     function hideOsd() {
-            var bottom = dialog.querySelector('.slideshowBottomBar');
+        const bottom = dialog.querySelector('.slideshowBottomBar');
         if (bottom) {
             slideDownToHide(bottom);
         }
@@ -540,7 +546,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
 
         element.classList.remove('hide');
 
-            var onFinish = function () {
+        const onFinish = function () {
             focusManager.focus(element.querySelector('.btnSlideshowPause'));
         };
 
@@ -550,11 +556,11 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
         }
 
         requestAnimationFrame(function () {
-                var keyframes = [
+            const keyframes = [
                 { transform: 'translate3d(0,' + element.offsetHeight + 'px,0)', opacity: '.3', offset: 0 },
                 { transform: 'translate3d(0,0,0)', opacity: '1', offset: 1 }
             ];
-                var timing = { duration: 300, iterations: 1, easing: 'ease-out' };
+            const timing = { duration: 300, iterations: 1, easing: 'ease-out' };
             element.animate(keyframes, timing).onfinish = onFinish;
         });
     }
@@ -568,7 +574,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
             return;
         }
 
-            var onFinish = function () {
+        const onFinish = function () {
             element.classList.add('hide');
         };
 
@@ -578,11 +584,11 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
         }
 
         requestAnimationFrame(function () {
-                var keyframes = [
+            const keyframes = [
                 { transform: 'translate3d(0,0,0)', opacity: '1', offset: 0 },
                 { transform: 'translate3d(0,' + element.offsetHeight + 'px,0)', opacity: '.3', offset: 1 }
             ];
-                var timing = { duration: 300, iterations: 1, easing: 'ease-out' };
+            const timing = { duration: 300, iterations: 1, easing: 'ease-out' };
             element.animate(keyframes, timing).onfinish = onFinish;
         });
     }
@@ -592,13 +598,13 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
      * @param {Event} event - Pointer movement event.
      */
     function onPointerMove(event) {
-            var pointerType = event.pointerType || (layoutManager.mobile ? 'touch' : 'mouse');
+        const pointerType = event.pointerType || (layoutManager.mobile ? 'touch' : 'mouse');
 
         if (pointerType === 'mouse') {
-                var eventX = event.screenX || 0;
+            const eventX = event.screenX || 0;
-                var eventY = event.screenY || 0;
+            const eventY = event.screenY || 0;
 
-                var obj = lastMouseMoveData;
+            const obj = lastMouseMoveData;
             if (!obj) {
                 lastMouseMoveData = {
                     x: eventX,
@@ -664,5 +670,4 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
             dialogHelper.close(dialog);
         }
     };
-    };
+}
-});

src/components/sortmenu/sortmenu.js

@@ -1,49 +1,51 @@
-define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutManager', 'connectionManager', 'globalize', 'userSettings', 'emby-select', 'paper-icon-button-light', 'material-icons', 'css!./../formdialog', 'emby-button', 'flexStyles'], function (require, dom, focusManager, dialogHelper, loading, layoutManager, connectionManager, globalize, userSettings) {
+import dialogHelper from 'dialogHelper';
-    'use strict';
+import layoutManager from 'layoutManager';
+import globalize from 'globalize';
+import * as userSettings from 'userSettings';
+import 'emby-select';
+import 'paper-icon-button-light';
+import 'material-icons';
+import 'css!./../formdialog';
+import 'emby-button';
+import 'flexStyles';
 
-    focusManager = focusManager.default || focusManager;
+function onSubmit(e) {
-
-    function onSubmit(e) {
     e.preventDefault();
     return false;
-    }
+}
 
-    function initEditor(context, settings) {
+function initEditor(context, settings) {
     context.querySelector('form').addEventListener('submit', onSubmit);
 
     context.querySelector('.selectSortOrder').value = settings.sortOrder;
     context.querySelector('.selectSortBy').value = settings.sortBy;
-    }
+}
 
-    function centerFocus(elem, horiz, on) {
+function centerFocus(elem, horiz, on) {
-        require(['scrollHelper'], function (scrollHelper) {
+    import('scrollHelper').then(({default: scrollHelper}) => {
-            scrollHelper = scrollHelper.default || scrollHelper;
+        const fn = on ? 'on' : 'off';
-            var fn = on ? 'on' : 'off';
         scrollHelper.centerFocus[fn](elem, horiz);
     });
-    }
+}
 
-    function fillSortBy(context, options) {
+function fillSortBy(context, options) {
-        var selectSortBy = context.querySelector('.selectSortBy');
+    const selectSortBy = context.querySelector('.selectSortBy');
 
     selectSortBy.innerHTML = options.map(function (o) {
         return '<option value="' + o.value + '">' + o.name + '</option>';
     }).join('');
-    }
+}
 
-    function saveValues(context, settings, settingsKey) {
+function saveValues(context, settingsKey) {
     userSettings.setFilter(settingsKey + '-sortorder', context.querySelector('.selectSortOrder').value);
     userSettings.setFilter(settingsKey + '-sortby', context.querySelector('.selectSortBy').value);
-    }
+}
 
-    function SortMenu() {
+class SortMenu {
-
+    show(options) {
-    }
-
-    SortMenu.prototype.show = function (options) {
         return new Promise(function (resolve, reject) {
-            require(['text!./sortmenu.template.html'], function (template) {
+            import('text!./sortmenu.template.html').then(({default: template}) => {
-                var dialogOptions = {
+                const dialogOptions = {
                     removeOnClose: true,
                     scrollY: false
                 };
@@ -54,11 +56,11 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana
                     dialogOptions.size = 'small';
                 }
 
-                var dlg = dialogHelper.createDialog(dialogOptions);
+                const dlg = dialogHelper.createDialog(dialogOptions);
 
                 dlg.classList.add('formDialog');
 
-                var html = '';
+                let html = '';
 
                 html += '<div class="formDialogHeader">';
                 html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
@@ -81,7 +83,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana
                     centerFocus(dlg.querySelector('.formDialogContent'), false, true);
                 }
 
-                var submitted;
+                let submitted;
 
                 dlg.querySelector('form').addEventListener('change', function () {
                     submitted = true;
@@ -93,7 +95,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana
                     }
 
                     if (submitted) {
-                        saveValues(dlg, options.settings, options.settingsKey);
+                        saveValues(dlg, options.settingsKey);
                         resolve();
                         return;
                     }
@@ -102,7 +104,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana
                 });
             });
         });
-    };
+    }
+}
 
-    return SortMenu;
+export default SortMenu;
-});

src/components/subtitleeditor/subtitleeditor.js

@@ -1,16 +1,27 @@
-define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings', 'connectionManager', 'loading', 'focusManager', 'dom', 'apphost', 'emby-select', 'listViewStyle', 'paper-icon-button-light', 'css!./../formdialog', 'material-icons', 'css!./subtitleeditor', 'emby-button', 'flexStyles'], function (dialogHelper, require, layoutManager, globalize, userSettings, connectionManager, loading, focusManager, dom, appHost) {
+import dialogHelper from 'dialogHelper';
-    'use strict';
+import layoutManager from 'layoutManager';
+import globalize from 'globalize';
+import * as userSettings from 'userSettings';
+import connectionManager from 'connectionManager';
+import loading from 'loading';
+import focusManager from 'focusManager';
+import dom from 'dom';
+import 'emby-select';
+import 'listViewStyle';
+import 'paper-icon-button-light';
+import 'css!./../formdialog';
+import 'material-icons';
+import 'css!./subtitleeditor';
+import 'emby-button';
+import 'flexStyles';
 
-    loading = loading.default || loading;
+let currentItem;
-    focusManager = focusManager.default || focusManager;
+let hasChanges;
 
-    var currentItem;
+function downloadRemoteSubtitles(context, id) {
-    var hasChanges;
+    let url = 'Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + id;
 
-    function downloadRemoteSubtitles(context, id) {
+    let apiClient = connectionManager.getApiClient(currentItem.ServerId);
-        var url = 'Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + id;
-
-        var apiClient = connectionManager.getApiClient(currentItem.ServerId);
     apiClient.ajax({
 
         type: 'POST',
@@ -19,19 +30,19 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     }).then(function () {
         hasChanges = true;
 
-            require(['toast'], function (toast) {
+        import('toast').then(({default: toast}) => {
             toast(globalize.translate('MessageDownloadQueued'));
         });
 
         focusManager.autoFocus(context);
     });
-    }
+}
 
-    function deleteLocalSubtitle(context, index) {
+function deleteLocalSubtitle(context, index) {
-        var msg = globalize.translate('MessageAreYouSureDeleteSubtitles');
+    let msg = globalize.translate('MessageAreYouSureDeleteSubtitles');
 
-        require(['confirm'], function (confirm) {
+    import('confirm').then(({default: confirm}) => {
-            confirm.default({
+        confirm({
 
             title: globalize.translate('ConfirmDeletion'),
             text: msg,
@@ -41,10 +52,10 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
         }).then(function () {
             loading.show();
 
-                var itemId = currentItem.Id;
+            let itemId = currentItem.Id;
-                var url = 'Videos/' + itemId + '/Subtitles/' + index;
+            let url = 'Videos/' + itemId + '/Subtitles/' + index;
 
-                var apiClient = connectionManager.getApiClient(currentItem.ServerId);
+            let apiClient = connectionManager.getApiClient(currentItem.ServerId);
 
             apiClient.ajax({
 
@@ -57,16 +68,16 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
             });
         });
     });
-    }
+}
 
-    function fillSubtitleList(context, item) {
+function fillSubtitleList(context, item) {
-        var streams = item.MediaStreams || [];
+    let streams = item.MediaStreams || [];
 
-        var subs = streams.filter(function (s) {
+    let subs = streams.filter(function (s) {
         return s.Type === 'Subtitle';
     });
 
-        var html = '';
+    let html = '';
 
     if (subs.length) {
         html += '<h2>' + globalize.translate('MySubtitles') + '</h2>';
@@ -74,10 +85,10 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
         html += '<div>';
 
         html += subs.map(function (s) {
-                var itemHtml = '';
+            let itemHtml = '';
 
-                var tagName = layoutManager.tv ? 'button' : 'div';
+            let tagName = layoutManager.tv ? 'button' : 'div';
-                var className = layoutManager.tv && s.Path ? 'listItem listItem-border btnDelete' : 'listItem listItem-border';
+            let className = layoutManager.tv && s.Path ? 'listItem listItem-border btnDelete' : 'listItem listItem-border';
 
             if (layoutManager.tv) {
                 className += ' listItem-focusscale listItem-button';
@@ -116,7 +127,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
         html += '</div>';
     }
 
-        var elem = context.querySelector('.subtitleList');
+    let elem = context.querySelector('.subtitleList');
 
     if (subs.length) {
         elem.classList.remove('hide');
@@ -124,32 +135,32 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
         elem.classList.add('hide');
     }
     elem.innerHTML = html;
-    }
+}
 
-    function fillLanguages(context, apiClient, languages) {
+function fillLanguages(context, apiClient, languages) {
-        var selectLanguage = context.querySelector('#selectLanguage');
+    let selectLanguage = context.querySelector('#selectLanguage');
 
     selectLanguage.innerHTML = languages.map(function (l) {
         return '<option value="' + l.ThreeLetterISOLanguageName + '">' + l.DisplayName + '</option>';
     });
 
-        var lastLanguage = userSettings.get('subtitleeditor-language');
+    let lastLanguage = userSettings.get('subtitleeditor-language');
     if (lastLanguage) {
         selectLanguage.value = lastLanguage;
     } else {
         apiClient.getCurrentUser().then(function (user) {
-                var lang = user.Configuration.SubtitleLanguagePreference;
+            let lang = user.Configuration.SubtitleLanguagePreference;
 
             if (lang) {
                 selectLanguage.value = lang;
             }
         });
     }
-    }
+}
 
-    function renderSearchResults(context, results) {
+function renderSearchResults(context, results) {
-        var lastProvider = '';
+    let lastProvider = '';
-        var html = '';
+    let html = '';
 
     if (!results.length) {
         context.querySelector('.noSearchResults').classList.remove('hide');
@@ -160,10 +171,10 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
 
     context.querySelector('.noSearchResults').classList.add('hide');
 
-        for (var i = 0, length = results.length; i < length; i++) {
+    for (let i = 0, length = results.length; i < length; i++) {
-            var result = results[i];
+        let result = results[i];
 
-            var provider = result.ProviderName;
+        let provider = result.ProviderName;
 
         if (provider !== lastProvider) {
             if (i > 0) {
@@ -174,8 +185,8 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
             lastProvider = provider;
         }
 
-            var tagName = layoutManager.tv ? 'button' : 'div';
+        let tagName = layoutManager.tv ? 'button' : 'div';
-            var className = layoutManager.tv ? 'listItem listItem-border btnOptions' : 'listItem listItem-border';
+        let className = layoutManager.tv ? 'listItem listItem-border btnOptions' : 'listItem listItem-border';
         if (layoutManager.tv) {
             className += ' listItem-focusscale listItem-button';
         }
@@ -184,7 +195,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
 
         html += '<span class="listItemIcon material-icons closed_caption"></span>';
 
-            var bodyClass = result.Comment || result.IsHashMatch ? 'three-line' : 'two-line';
+        let bodyClass = result.Comment || result.IsHashMatch ? 'three-line' : 'two-line';
 
         html += '<div class="listItemBody ' + bodyClass + '">';
 
@@ -221,34 +232,34 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
         html += '</div>';
     }
 
-        var elem = context.querySelector('.subtitleResults');
+    let elem = context.querySelector('.subtitleResults');
     elem.innerHTML = html;
 
     loading.hide();
-    }
+}
 
-    function searchForSubtitles(context, language) {
+function searchForSubtitles(context, language) {
     userSettings.set('subtitleeditor-language', language);
 
     loading.show();
 
-        var apiClient = connectionManager.getApiClient(currentItem.ServerId);
+    let apiClient = connectionManager.getApiClient(currentItem.ServerId);
-        var url = apiClient.getUrl('Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + language);
+    let url = apiClient.getUrl('Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + language);
 
     apiClient.getJSON(url).then(function (results) {
         renderSearchResults(context, results);
     });
-    }
+}
 
-    function reload(context, apiClient, itemId) {
+function reload(context, apiClient, itemId) {
     context.querySelector('.noSearchResults').classList.add('hide');
 
     function onGetItem(item) {
         currentItem = item;
 
         fillSubtitleList(context, item);
-            var file = item.Path || '';
+        let file = item.Path || '';
-            var index = Math.max(file.lastIndexOf('/'), file.lastIndexOf('\\'));
+        let index = Math.max(file.lastIndexOf('/'), file.lastIndexOf('\\'));
         if (index > -1) {
             file = file.substring(index + 1);
         }
@@ -269,56 +280,56 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     } else {
         onGetItem(itemId);
     }
-    }
+}
 
-    function onSearchSubmit(e) {
+function onSearchSubmit(e) {
-        var form = this;
+    let form = this;
 
-        var lang = form.querySelector('#selectLanguage', form).value;
+    let lang = form.querySelector('#selectLanguage', form).value;
 
     searchForSubtitles(dom.parentWithClass(form, 'formDialogContent'), lang);
 
     e.preventDefault();
     return false;
-    }
+}
 
-    function onSubtitleListClick(e) {
+function onSubtitleListClick(e) {
-        var btnDelete = dom.parentWithClass(e.target, 'btnDelete');
+    let btnDelete = dom.parentWithClass(e.target, 'btnDelete');
     if (btnDelete) {
-            var index = btnDelete.getAttribute('data-index');
+        let index = btnDelete.getAttribute('data-index');
-            var context = dom.parentWithClass(btnDelete, 'subtitleEditorDialog');
+        let context = dom.parentWithClass(btnDelete, 'subtitleEditorDialog');
         deleteLocalSubtitle(context, index);
     }
-    }
+}
 
-    function onSubtitleResultsClick(e) {
+function onSubtitleResultsClick(e) {
-        var subtitleId;
+    let subtitleId;
-        var context;
+    let context;
 
-        var btnOptions = dom.parentWithClass(e.target, 'btnOptions');
+    let btnOptions = dom.parentWithClass(e.target, 'btnOptions');
     if (btnOptions) {
         subtitleId = btnOptions.getAttribute('data-subid');
         context = dom.parentWithClass(btnOptions, 'subtitleEditorDialog');
         showDownloadOptions(btnOptions, context, subtitleId);
     }
 
-        var btnDownload = dom.parentWithClass(e.target, 'btnDownload');
+    let btnDownload = dom.parentWithClass(e.target, 'btnDownload');
     if (btnDownload) {
         subtitleId = btnDownload.getAttribute('data-subid');
         context = dom.parentWithClass(btnDownload, 'subtitleEditorDialog');
         downloadRemoteSubtitles(context, subtitleId);
     }
-    }
+}
 
-    function showDownloadOptions(button, context, subtitleId) {
+function showDownloadOptions(button, context, subtitleId) {
-        var items = [];
+    let items = [];
 
     items.push({
         name: globalize.translate('Download'),
         id: 'download'
     });
 
-        require(['actionsheet'], function (actionsheet) {
+    import('actionsheet').then(({default: actionsheet}) => {
         actionsheet.show({
             items: items,
             positionTo: button
@@ -333,22 +344,21 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
             }
         });
     });
-    }
+}
 
-    function centerFocus(elem, horiz, on) {
+function centerFocus(elem, horiz, on) {
-        require(['scrollHelper'], function (scrollHelper) {
+    import('scrollHelper').then(({default: scrollHelper}) => {
-            scrollHelper = scrollHelper.default || scrollHelper;
+        let fn = on ? 'on' : 'off';
-            var fn = on ? 'on' : 'off';
         scrollHelper.centerFocus[fn](elem, horiz);
     });
-    }
+}
 
-    function showEditorInternal(itemId, serverId, template) {
+function showEditorInternal(itemId, serverId, template) {
     hasChanges = false;
 
-        var apiClient = connectionManager.getApiClient(serverId);
+    let apiClient = connectionManager.getApiClient(serverId);
     return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
-            var dialogOptions = {
+        let dialogOptions = {
             removeOnClose: true,
             scrollY: false
         };
@@ -359,7 +369,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
             dialogOptions.size = 'small';
         }
 
-            var dlg = dialogHelper.createDialog(dialogOptions);
+        let dlg = dialogHelper.createDialog(dialogOptions);
 
         dlg.classList.add('formDialog');
         dlg.classList.add('subtitleEditorDialog');
@@ -370,7 +380,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
 
         dlg.querySelector('.subtitleSearchForm').addEventListener('submit', onSearchSubmit);
 
-            var btnSubmit = dlg.querySelector('.btnSubmit');
+        let btnSubmit = dlg.querySelector('.btnSubmit');
 
         if (layoutManager.tv) {
             centerFocus(dlg.querySelector('.formDialogContent'), false, true);
@@ -379,7 +389,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
             btnSubmit.classList.add('hide');
         }
 
-            var editorContent = dlg.querySelector('.formDialogContent');
+        let editorContent = dlg.querySelector('.formDialogContent');
 
         dlg.querySelector('.subtitleList').addEventListener('click', onSubtitleListClick);
         dlg.querySelector('.subtitleResults').addEventListener('click', onSubtitleResultsClick);
@@ -410,19 +420,18 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
             reload(editorContent, apiClient, item);
         });
     });
-    }
+}
 
-    function showEditor(itemId, serverId) {
+function showEditor(itemId, serverId) {
     loading.show();
 
     return new Promise(function (resolve, reject) {
-            require(['text!./subtitleeditor.template.html'], function (template) {
+        import('text!./subtitleeditor.template.html').then(({default: template}) => {
             showEditorInternal(itemId, serverId, template).then(resolve, reject);
         });
     });
-    }
+}
 
-    return {
+export default {
     show: showEditor
-    };
+};
-});

src/components/subtitlesettings/subtitleappearancehelper.js

@@ -4,7 +4,7 @@
  */
 
 function getTextStyles(settings, preview) {
-    let list = [];
+    const list = [];
 
     switch (settings.textSize || '') {
         case 'smaller':
@@ -130,14 +130,14 @@ export function getStyles(settings, preview) {
 
 function applyStyleList(styles, elem) {
     for (let i = 0, length = styles.length; i < length; i++) {
-        let style = styles[i];
+        const style = styles[i];
 
         elem.style[style.name] = style.value;
     }
 }
 
 export function applyStyles(elements, appearanceSettings) {
-    let styles = getStyles(appearanceSettings, !!elements.preview);
+    const styles = getStyles(appearanceSettings, !!elements.preview);
 
     if (elements.text) {
         applyStyleList(styles.text, elements.text);

src/components/subtitlesettings/subtitlesettings.js

@@ -23,7 +23,7 @@ import 'css!./subtitlesettings';
  */
 
 function getSubtitleAppearanceObject(context) {
-    let appearanceSettings = {};
+    const appearanceSettings = {};
 
     appearanceSettings.textSize = context.querySelector('#selectTextSize').value;
     appearanceSettings.dropShadow = context.querySelector('#selectDropShadow').value;
@@ -41,7 +41,7 @@ function loadForm(context, user, userSettings, appearanceSettings, apiClient) {
             context.querySelector('.fldBurnIn').classList.remove('hide');
         }
 
-        let selectSubtitleLanguage = context.querySelector('#selectSubtitleLanguage');
+        const selectSubtitleLanguage = context.querySelector('#selectSubtitleLanguage');
 
         settingsHelper.populateLanguages(selectSubtitleLanguage, allCultures);
 
@@ -101,9 +101,9 @@ function save(instance, context, userId, userSettings, apiClient, enableSaveConf
 }
 
 function onSubtitleModeChange(e) {
-    let view = dom.parentWithClass(e.target, 'subtitlesettings');
+    const view = dom.parentWithClass(e.target, 'subtitlesettings');
 
-    let subtitlesHelp = view.querySelectorAll('.subtitlesHelp');
+    const subtitlesHelp = view.querySelectorAll('.subtitlesHelp');
     for (let i = 0, length = subtitlesHelp.length; i < length; i++) {
         subtitlesHelp[i].classList.add('hide');
     }
@@ -111,11 +111,11 @@ function onSubtitleModeChange(e) {
 }
 
 function onAppearanceFieldChange(e) {
-    let view = dom.parentWithClass(e.target, 'subtitlesettings');
+    const view = dom.parentWithClass(e.target, 'subtitlesettings');
 
-    let appearanceSettings = getSubtitleAppearanceObject(view);
+    const appearanceSettings = getSubtitleAppearanceObject(view);
 
-    let elements = {
+    const elements = {
         window: view.querySelector('.subtitleappearance-preview-window'),
         text: view.querySelector('.subtitleappearance-preview-text'),
         preview: true
@@ -226,20 +226,20 @@ export class SubtitleSettings {
     }
 
     loadData() {
-        let self = this;
+        const self = this;
-        let context = self.options.element;
+        const context = self.options.element;
 
         loading.show();
 
-        let userId = self.options.userId;
+        const userId = self.options.userId;
-        let apiClient = connectionManager.getApiClient(self.options.serverId);
+        const apiClient = connectionManager.getApiClient(self.options.serverId);
-        let userSettings = self.options.userSettings;
+        const userSettings = self.options.userSettings;
 
         apiClient.getUser(userId).then(function (user) {
             userSettings.setUserInfo(userId, apiClient).then(function () {
                 self.dataLoaded = true;
 
-                let appearanceSettings = userSettings.getSubtitleAppearanceSettings(self.options.appearanceKey);
+                const appearanceSettings = userSettings.getSubtitleAppearanceSettings(self.options.appearanceKey);
 
                 loadForm(context, user, userSettings, appearanceSettings, apiClient);
             });
@@ -256,12 +256,12 @@ export class SubtitleSettings {
 
     onSubmit(e) {
         const self = this;
-        let apiClient = connectionManager.getApiClient(self.options.serverId);
+        const apiClient = connectionManager.getApiClient(self.options.serverId);
-        let userId = self.options.userId;
+        const userId = self.options.userId;
-        let userSettings = self.options.userSettings;
+        const userSettings = self.options.userSettings;
 
         userSettings.setUserInfo(userId, apiClient).then(function () {
-            let enableSaveConfirmation = self.options.enableSaveConfirmation;
+            const enableSaveConfirmation = self.options.enableSaveConfirmation;
             save(self, self.options.element, userId, userSettings, apiClient, enableSaveConfirmation);
         });
 

src/components/subtitlesettings/subtitlesettings.template.html

@@ -14,7 +14,7 @@
                 <option value="Smart">${Smart}</option>
                 <option value="OnlyForced">${OnlyForcedSubtitles}</option>
                 <option value="Always">${AlwaysPlaySubtitles}</option>
-                <option value="None">${NoSubtitles}</option>
+                <option value="None">${None}</option>
             </select>
             <div class="fieldDescription subtitlesDefaultHelp subtitlesHelp hide">${DefaultSubtitlesHelp}</div>
             <div class="fieldDescription subtitlesSmartHelp subtitlesHelp hide">${SmartSubtitlesHelp}</div>

src/components/subtitlesync/subtitlesync.js

@@ -1,16 +1,16 @@
-define(['playbackManager', 'layoutManager', 'text!./subtitlesync.template.html', 'css!./subtitlesync'], function (playbackManager, layoutManager, template, css) {
+import playbackManager from 'playbackManager';
-    'use strict';
+import layoutManager from 'layoutManager';
+import template from 'text!./subtitlesync.template.html';
+import 'css!./subtitlesync';
 
-    playbackManager = playbackManager.default || playbackManager;
+let player;
+let subtitleSyncSlider;
+let subtitleSyncTextField;
+let subtitleSyncCloseButton;
+let subtitleSyncContainer;
 
-    var player;
+function init(instance) {
-    var subtitleSyncSlider;
+    const parent = document.createElement('div');
-    var subtitleSyncTextField;
-    var subtitleSyncCloseButton;
-    var subtitleSyncContainer;
-
-    function init(instance) {
-        var parent = document.createElement('div');
     document.body.appendChild(parent);
     parent.innerHTML = template;
 
@@ -29,7 +29,7 @@ define(['playbackManager', 'layoutManager', 'text!./subtitlesync.template.html',
 
     subtitleSyncContainer.classList.add('hide');
 
-        subtitleSyncTextField.updateOffset = function(offset) {
+    subtitleSyncTextField.updateOffset = function (offset) {
         this.textContent = offset + 's';
     };
 
@@ -38,10 +38,10 @@ define(['playbackManager', 'layoutManager', 'text!./subtitlesync.template.html',
         this.hasFocus = true;
     });
 
-        subtitleSyncTextField.addEventListener('keydown', function(event) {
+    subtitleSyncTextField.addEventListener('keydown', function (event) {
         if (event.key === 'Enter') {
             // if input key is enter search for float pattern
-                var inputOffset = /[-+]?\d+\.?\d*/g.exec(this.textContent);
+            let inputOffset = /[-+]?\d+\.?\d*/g.exec(this.textContent);
             if (inputOffset) {
                 inputOffset = inputOffset[0];
 
@@ -71,14 +71,14 @@ define(['playbackManager', 'layoutManager', 'text!./subtitlesync.template.html',
         event.stopPropagation();
     });
 
-        subtitleSyncTextField.blur = function() {
+    subtitleSyncTextField.blur = function () {
         // prevent textfield to blur while element has focus
         if (!this.hasFocus && this.prototype) {
             this.prototype.blur();
         }
     };
 
-        subtitleSyncSlider.updateOffset = function(percent) {
+    subtitleSyncSlider.updateOffset = function (percent) {
         // default value is 0s = 50%
         this.value = percent === undefined ? 50 : percent;
     };
@@ -92,56 +92,57 @@ define(['playbackManager', 'layoutManager', 'text!./subtitlesync.template.html',
     });
 
     subtitleSyncSlider.getBubbleHtml = function (value) {
-            var newOffset = getOffsetFromPercentage(value);
+        const newOffset = getOffsetFromPercentage(value);
         return '<h1 class="sliderBubbleText">' +
             (newOffset > 0 ? '+' : '') + parseFloat(newOffset) + 's' +
             '</h1>';
     };
 
-        subtitleSyncCloseButton.addEventListener('click', function() {
+    subtitleSyncCloseButton.addEventListener('click', function () {
         playbackManager.disableShowingSubtitleOffset(player);
         SubtitleSync.prototype.toggle('forceToHide');
     });
 
     instance.element = parent;
-    }
+}
 
-    function getOffsetFromPercentage(value) {
+function getOffsetFromPercentage(value) {
     // convert percent to fraction
-        var offset = (value - 50) / 50;
+    let offset = (value - 50) / 50;
     // multiply by offset min/max range value (-x to +x) :
     offset *= 30;
     return offset.toFixed(1);
-    }
+}
 
-    function getPercentageFromOffset(value) {
+function getPercentageFromOffset(value) {
     // divide by offset min/max range value (-x to +x) :
-        var percentValue = value / 30;
+    let percentValue = value / 30;
     // convert fraction to percent
     percentValue *= 50;
     percentValue += 50;
     return Math.min(100, Math.max(0, percentValue.toFixed()));
-    }
+}
 
-    function SubtitleSync(currentPlayer) {
+class SubtitleSync {
+    constructor(currentPlayer) {
         player = currentPlayer;
         init(this);
     }
 
-    SubtitleSync.prototype.destroy = function() {
+    destroy() {
         SubtitleSync.prototype.toggle('forceToHide');
         if (player) {
             playbackManager.disableShowingSubtitleOffset(player);
             playbackManager.setSubtitleOffset(0, player);
         }
-        var elem = this.element;
+        const elem = this.element;
         if (elem) {
             elem.parentNode.removeChild(elem);
             this.element = null;
         }
-    };
+    }
 
-    SubtitleSync.prototype.toggle = function(action) {
+    toggle(action) {
         if (player && playbackManager.supportSubtitleOffset(player)) {
             /* eslint-disable no-fallthrough */
             switch (action) {
@@ -170,7 +171,7 @@ define(['playbackManager', 'layoutManager', 'text!./subtitlesync.template.html',
             }
             /* eslint-enable no-fallthrough */
         }
-    };
+    }
+}
 
-    return SubtitleSync;
+export default SubtitleSync;
-});

src/components/tabbedview/tabbedview.js

@@ -1,7 +1,9 @@
-define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (backdrop, mainTabsManager, layoutManager) {
+import backdrop from 'backdrop';
-    'use strict';
+import * as mainTabsManager from 'mainTabsManager';
+import layoutManager from 'layoutManager';
+import 'emby-tabs';
 
-    function onViewDestroy(e) {
+function onViewDestroy(e) {
     var tabControllers = this.tabControllers;
 
     if (tabControllers) {
@@ -18,13 +20,14 @@ define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (
     this.params = null;
     this.currentTabController = null;
     this.initialTabIndex = null;
-    }
+}
 
-    function onBeforeTabChange() {
+function onBeforeTabChange() {
 
-    }
+}
 
-    function TabbedView(view, params) {
+class TabbedView {
+    constructor(view, params) {
         this.tabControllers = [];
         this.view = view;
         this.params = params;
@@ -85,7 +88,7 @@ define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (
         view.addEventListener('viewdestroy', onViewDestroy.bind(this));
     }
 
-    TabbedView.prototype.onResume = function (options) {
+    onResume(options) {
         this.setTitle();
         backdrop.clearBackdrop();
 
@@ -96,19 +99,18 @@ define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (
         } else if (currentTabController && currentTabController.onResume) {
             currentTabController.onResume({});
         }
-    };
+    }
 
-    TabbedView.prototype.onPause = function () {
+    onPause() {
         var currentTabController = this.currentTabController;
 
         if (currentTabController && currentTabController.onPause) {
             currentTabController.onPause();
         }
-    };
+    }
-
+    setTitle() {
-    TabbedView.prototype.setTitle = function () {
         Emby.Page.setTitle('');
-    };
+    }
+}
 
-    return TabbedView;
+export default TabbedView;
-});

src/components/themeMediaPlayer.js

@@ -1,13 +1,12 @@
-define(['playbackManager', 'userSettings', 'connectionManager'], function (playbackManager, userSettings, connectionManager) {
+import playbackManager from 'playbackManager';
-    'use strict';
+import * as userSettings from 'userSettings';
+import connectionManager from 'connectionManager';
 
-    playbackManager = playbackManager.default || playbackManager;
+let currentOwnerId;
+let currentThemeIds = [];
 
-    var currentOwnerId;
+function playThemeMedia(items, ownerId) {
-    var currentThemeIds = [];
+    const currentThemeItems = items.filter(function (i) {
-
-    function playThemeMedia(items, ownerId) {
-        var currentThemeItems = items.filter(function (i) {
         return enabled(i.MediaType);
     });
 
@@ -32,27 +31,27 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
     } else {
         stopIfPlaying();
     }
-    }
+}
 
-    function stopIfPlaying() {
+function stopIfPlaying() {
     if (currentOwnerId) {
         playbackManager.stop();
     }
 
     currentOwnerId = null;
-    }
+}
 
-    function enabled(mediaType) {
+function enabled(mediaType) {
     if (mediaType === 'Video') {
         return userSettings.enableThemeVideos();
     }
 
     return userSettings.enableThemeSongs();
-    }
+}
 
-    var excludeTypes = ['CollectionFolder', 'UserView', 'Program', 'SeriesTimer', 'Person', 'TvChannel', 'Channel'];
+const excludeTypes = ['CollectionFolder', 'UserView', 'Program', 'SeriesTimer', 'Person', 'TvChannel', 'Channel'];
 
-    function loadThemeMedia(item) {
+function loadThemeMedia(item) {
     if (item.CollectionType) {
         stopIfPlaying();
         return;
@@ -63,41 +62,40 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
         return;
     }
 
-        var apiClient = connectionManager.getApiClient(item.ServerId);
+    const apiClient = connectionManager.getApiClient(item.ServerId);
     apiClient.getThemeMedia(apiClient.getCurrentUserId(), item.Id, true).then(function (themeMediaResult) {
-            var ownerId = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.OwnerId : themeMediaResult.ThemeSongsResult.OwnerId;
+        const ownerId = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.OwnerId : themeMediaResult.ThemeSongsResult.OwnerId;
 
         if (ownerId !== currentOwnerId) {
-                var items = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.Items : themeMediaResult.ThemeSongsResult.Items;
+            const items = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.Items : themeMediaResult.ThemeSongsResult.Items;
 
             playThemeMedia(items, ownerId);
         }
     });
-    }
+}
 
-    document.addEventListener('viewshow', function (e) {
+document.addEventListener('viewshow', function (e) {
-        var state = e.detail.state || {};
+    const state = e.detail.state || {};
-        var item = state.item;
+    const item = state.item;
 
     if (item && item.ServerId) {
         loadThemeMedia(item);
         return;
     }
 
-        var viewOptions = e.detail.options || {};
+    const viewOptions = e.detail.options || {};
 
     if (viewOptions.supportsThemeMedia) {
         // Do nothing here, allow it to keep playing
     } else {
         playThemeMedia([], null);
     }
-    }, true);
+}, true);
 
-    Events.on(playbackManager, 'playbackstart', function (e, player) {
+Events.on(playbackManager, 'playbackstart', function (e, player) {
-        var item = playbackManager.currentItem(player);
+    const item = playbackManager.currentItem(player);
     // User played something manually
     if (currentThemeIds.indexOf(item.Id) == -1) {
         currentOwnerId = null;
     }
-    });
 });

src/components/tunerPicker.js

@@ -1,15 +1,22 @@
-define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize', 'loading', 'browser', 'focusManager', 'scrollHelper', 'material-icons', 'formDialogStyle', 'emby-button', 'emby-itemscontainer', 'cardStyle'], function (dialogHelper, dom, layoutManager, connectionManager, globalize, loading, browser, focusManager, scrollHelper) {
+import dialogHelper from 'dialogHelper';
-    'use strict';
+import dom from 'dom';
+import layoutManager from 'layoutManager';
+import connectionManager from 'connectionManager';
+import globalize from 'globalize';
+import loading from 'loading';
+import browser from 'browser';
+import focusManager from 'focusManager';
+import scrollHelper from 'scrollHelper';
+import 'material-icons';
+import 'formDialogStyle';
+import 'emby-button';
+import 'emby-itemscontainer';
+import 'cardStyle';
 
-    browser = browser.default || browser;
+const enableFocusTransform = !browser.slow && !browser.edge;
-    loading = loading.default || loading;
-    focusManager = focusManager.default || focusManager;
-    scrollHelper = scrollHelper.default || scrollHelper;
 
-    var enableFocusTransform = !browser.slow && !browser.edge;
+function getEditorHtml() {
-
+    let html = '';
-    function getEditorHtml() {
-        var html = '';
     html += '<div class="formDialogContent scrollY">';
     html += '<div class="dialogContentInner dialog-content-centered">';
     html += '<div class="loadingContent hide">';
@@ -21,15 +28,13 @@ define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize'
     html += '</div>';
     html += '</div>';
     return html += '</div>';
-    }
+}
 
-    function getDeviceHtml(device) {
+function getDeviceHtml(device) {
-        var padderClass;
+    let html = '';
-        var html = '';
+    let cssClass = 'card scalableCard backdropCard backdropCard-scalable';
-        var cssClass = 'card scalableCard';
+    const cardBoxCssClass = 'cardBox visualCardBox';
-        var cardBoxCssClass = 'cardBox visualCardBox';
+    const padderClass = 'cardPadder-backdrop';
-        cssClass += ' backdropCard backdropCard-scalable';
-        padderClass = 'cardPadder-backdrop';
 
     // TODO move card creation code to Card component
 
@@ -58,9 +63,9 @@ define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize'
     html += '</div>';
     html += '</div>';
     return html += '</button>';
-    }
+}
 
-    function getTunerName(providerId) {
+function getTunerName(providerId) {
     switch (providerId = providerId.toLowerCase()) {
         case 'm3u':
             return 'M3U';
@@ -77,14 +82,12 @@ define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize'
         default:
             return 'Unknown';
     }
-    }
+}
 
-    function renderDevices(view, devices) {
+function renderDevices(view, devices) {
-        var i;
+    let html = '';
-        var length;
-        var html = '';
 
-        for (i = 0, length = devices.length; i < length; i++) {
+    for (let i = 0, length = devices.length; i < length; i++) {
         html += getDeviceHtml(devices[i]);
     }
 
@@ -95,15 +98,15 @@ define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize'
         view.querySelector('.devicesHeader').classList.add('hide');
     }
 
-        var elem = view.querySelector('.results');
+    const elem = view.querySelector('.results');
     elem.innerHTML = html;
 
     if (layoutManager.tv) {
         focusManager.autoFocus(elem);
     }
-    }
+}
 
-    function discoverDevices(view, apiClient) {
+function discoverDevices(view, apiClient) {
     loading.show();
     view.querySelector('.loadingContent').classList.remove('hide');
     return ApiClient.getJSON(ApiClient.getUrl('LiveTv/Tuners/Discvover', {
@@ -114,11 +117,11 @@ define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize'
         view.querySelector('.loadingContent').classList.add('hide');
         loading.hide();
     });
-    }
+}
 
-    function tunerPicker() {
+function tunerPicker() {
     this.show = function (options) {
-            var dialogOptions = {
+        const dialogOptions = {
             removeOnClose: true,
             scrollY: false
         };
@@ -129,9 +132,9 @@ define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize'
             dialogOptions.size = 'small';
         }
 
-            var dlg = dialogHelper.createDialog(dialogOptions);
+        const dlg = dialogHelper.createDialog(dialogOptions);
         dlg.classList.add('formDialog');
-            var html = '';
+        let html = '';
         html += '<div class="formDialogHeader">';
         html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
         html += '<h3 class="formDialogHeaderTitle">';
@@ -143,12 +146,12 @@ define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize'
         dlg.querySelector('.btnCancel').addEventListener('click', function () {
             dialogHelper.close(dlg);
         });
-            var deviceResult;
+        let deviceResult;
         dlg.querySelector('.results').addEventListener('click', function (e) {
-                var tunerCard = dom.parentWithClass(e.target, 'card');
+            const tunerCard = dom.parentWithClass(e.target, 'card');
 
             if (tunerCard) {
-                    var deviceId = tunerCard.getAttribute('data-id');
+                const deviceId = tunerCard.getAttribute('data-id');
                 deviceResult = currentDevices.filter(function (d) {
                     return d.DeviceId === deviceId;
                 })[0];
@@ -160,7 +163,7 @@ define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize'
             scrollHelper.centerFocus.on(dlg.querySelector('.formDialogContent'), false);
         }
 
-            var apiClient = connectionManager.getApiClient(options.serverId);
+        const apiClient = connectionManager.getApiClient(options.serverId);
         discoverDevices(dlg, apiClient);
 
         if (layoutManager.tv) {
@@ -175,8 +178,8 @@ define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize'
             return Promise.reject();
         });
     };
-    }
+}
 
-    var currentDevices = [];
+let currentDevices = [];
-    return tunerPicker;
+
-});
+export default tunerPicker;

src/components/tvproviders/schedulesdirect.template.html

@@ -27,7 +27,7 @@
             <input is="emby-input" class="txtPass" label="${LabelPassword}" required="required" autocomplete="off" type="password" />
         </div>
         <div>
-            <button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
+            <button is="emby-button" type="submit" class="raised button-submit block"><span>${Save}</span></button>
         </div>
     </div>
 </form>
@@ -65,7 +65,7 @@
             </div>
             <br />
             <div>
-                <button is="emby-button" type="submit" class="raised button-submit block btnSubmitListingsContainer btnSubmitListings hide"><span>${ButtonSave}</span></button>
+                <button is="emby-button" type="submit" class="raised button-submit block btnSubmitListingsContainer btnSubmitListings hide"><span>${Save}</span></button>
                 <button is="emby-button" type="button" class="raised button-cancel block btnCancel hide" onclick="history.back();"><span>${ButtonCancel}</span></button>
             </div>
         </div>

src/components/tvproviders/xmltv.template.html

@@ -56,7 +56,7 @@
         </div>
     </div>
     <div>
-        <button is="emby-button" type="submit" class="raised button-submit block btnSubmitListings hide"><span>${ButtonSave}</span></button>
+        <button is="emby-button" type="submit" class="raised button-submit block btnSubmitListings hide"><span>${Save}</span></button>
         <button is="emby-button" type="button" class="raised button-cancel block btnCancel hide" onclick="history.back();"><span>${ButtonCancel}</span></button>
     </div>
 </form>

src/components/userdatabuttons/userdatabuttons.js

@@ -1,21 +1,27 @@
-define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-button-light', 'material-icons', 'emby-button', 'css!./userdatabuttons'], function (connectionManager, globalize, dom, itemHelper) {
+import connectionManager from 'connectionManager';
-    'use strict';
+import globalize from 'globalize';
+import dom from 'dom';
+import itemHelper from 'itemHelper';
+import 'paper-icon-button-light';
+import 'material-icons';
+import 'emby-button';
+import 'css!./userdatabuttons';
 
-    var userDataMethods = {
+const userDataMethods = {
     markPlayed: markPlayed,
     markDislike: markDislike,
     markLike: markLike,
     markFavorite: markFavorite
-    };
+};
 
-    function getUserDataButtonHtml(method, itemId, serverId, buttonCssClass, iconCssClass, icon, tooltip, style) {
+function getUserDataButtonHtml(method, itemId, serverId, buttonCssClass, iconCssClass, icon, tooltip, style) {
     if (style === 'fab-mini') {
         style = 'fab';
         buttonCssClass = buttonCssClass ? (buttonCssClass + ' mini') : 'mini';
     }
 
-        var is = style === 'fab' ? 'emby-button' : 'paper-icon-button-light';
+    const is = style === 'fab' ? 'emby-button' : 'paper-icon-button-light';
-        var className = style === 'fab' ? 'autoSize fab' : 'autoSize';
+    let className = style === 'fab' ? 'autoSize fab' : 'autoSize';
 
     if (buttonCssClass) {
         className += ' ' + buttonCssClass;
@@ -30,21 +36,21 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     iconCssClass += 'material-icons';
 
     return '<button title="' + tooltip + '" data-itemid="' + itemId + '" data-serverid="' + serverId + '" is="' + is + '" data-method="' + method + '" class="' + className + '"><span class="' + iconCssClass + ' ' + icon + '"></span></button>';
-    }
+}
 
-    function onContainerClick(e) {
+function onContainerClick(e) {
-        var btnUserData = dom.parentWithClass(e.target, 'btnUserData');
+    const btnUserData = dom.parentWithClass(e.target, 'btnUserData');
 
     if (!btnUserData) {
         return;
     }
 
-        var method = btnUserData.getAttribute('data-method');
+    const method = btnUserData.getAttribute('data-method');
     userDataMethods[method](btnUserData);
-    }
+}
 
-    function fill(options) {
+function fill(options) {
-        var html = getIconsHtml(options);
+    const html = getIconsHtml(options);
 
     if (options.fillMode === 'insertAdjacent') {
         options.element.insertAdjacentHTML(options.insertLocation || 'beforeend', html);
@@ -59,44 +65,44 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     dom.addEventListener(options.element, 'click', onContainerClick, {
         passive: true
     });
-    }
+}
 
-    function destroy(options) {
+function destroy(options) {
     options.element.innerHTML = '';
 
     dom.removeEventListener(options.element, 'click', onContainerClick, {
         passive: true
     });
-    }
+}
 
-    function getIconsHtml(options) {
+function getIconsHtml(options) {
-        var item = options.item;
+    const item = options.item;
-        var includePlayed = options.includePlayed;
+    const includePlayed = options.includePlayed;
-        var cssClass = options.cssClass;
+    const cssClass = options.cssClass;
-        var style = options.style;
+    const style = options.style;
 
-        var html = '';
+    let html = '';
 
-        var userData = item.UserData || {};
+    const userData = item.UserData || {};
 
-        var itemId = item.Id;
+    const itemId = item.Id;
 
     if (itemHelper.isLocalItem(item)) {
         return html;
     }
 
-        var btnCssClass = 'btnUserData';
+    let btnCssClass = 'btnUserData';
 
     if (cssClass) {
         btnCssClass += ' ' + cssClass;
     }
 
-        var iconCssClass = options.iconCssClass;
+    const iconCssClass = options.iconCssClass;
 
-        var serverId = item.ServerId;
+    const serverId = item.ServerId;
 
     if (includePlayed !== false) {
-            var tooltipPlayed = globalize.translate('MarkPlayed');
+        const tooltipPlayed = globalize.translate('MarkPlayed');
 
         if (itemHelper.canMarkPlayed(item)) {
             if (userData.Played) {
@@ -107,7 +113,7 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
         }
     }
 
-        var tooltipFavorite = globalize.translate('Favorite');
+    const tooltipFavorite = globalize.translate('Favorite');
     if (userData.IsFavorite) {
         html += getUserDataButtonHtml('markFavorite', itemId, serverId, btnCssClass + ' btnUserData btnUserDataOn', iconCssClass, 'favorite', tooltipFavorite, style);
     } else {
@@ -115,13 +121,13 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     }
 
     return html;
-    }
+}
 
-    function markFavorite(link) {
+function markFavorite(link) {
-        var id = link.getAttribute('data-itemid');
+    const id = link.getAttribute('data-itemid');
-        var serverId = link.getAttribute('data-serverid');
+    const serverId = link.getAttribute('data-serverid');
 
-        var markAsFavorite = !link.classList.contains('btnUserDataOn');
+    const markAsFavorite = !link.classList.contains('btnUserDataOn');
 
     favorite(id, serverId, markAsFavorite);
 
@@ -130,11 +136,11 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     } else {
         link.classList.remove('btnUserDataOn');
     }
-    }
+}
 
-    function markLike(link) {
+function markLike(link) {
-        var id = link.getAttribute('data-itemid');
+    const id = link.getAttribute('data-itemid');
-        var serverId = link.getAttribute('data-serverid');
+    const serverId = link.getAttribute('data-serverid');
 
     if (!link.classList.contains('btnUserDataOn')) {
         likes(id, serverId, true);
@@ -147,11 +153,11 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     }
 
     link.parentNode.querySelector('.btnDislike').classList.remove('btnUserDataOn');
-    }
+}
 
-    function markDislike(link) {
+function markDislike(link) {
-        var id = link.getAttribute('data-itemid');
+    const id = link.getAttribute('data-itemid');
-        var serverId = link.getAttribute('data-serverid');
+    const serverId = link.getAttribute('data-serverid');
 
     if (!link.classList.contains('btnUserDataOn')) {
         likes(id, serverId, false);
@@ -164,11 +170,11 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     }
 
     link.parentNode.querySelector('.btnLike').classList.remove('btnUserDataOn');
-    }
+}
 
-    function markPlayed(link) {
+function markPlayed(link) {
-        var id = link.getAttribute('data-itemid');
+    const id = link.getAttribute('data-itemid');
-        var serverId = link.getAttribute('data-serverid');
+    const serverId = link.getAttribute('data-serverid');
 
     if (!link.classList.contains('btnUserDataOn')) {
         played(id, serverId, true);
@@ -179,36 +185,35 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
 
         link.classList.remove('btnUserDataOn');
     }
-    }
+}
 
-    function likes(id, serverId, isLiked) {
+function likes(id, serverId, isLiked) {
-        var apiClient = connectionManager.getApiClient(serverId);
+    const apiClient = connectionManager.getApiClient(serverId);
     return apiClient.updateUserItemRating(apiClient.getCurrentUserId(), id, isLiked);
-    }
+}
 
-    function played(id, serverId, isPlayed) {
+function played(id, serverId, isPlayed) {
-        var apiClient = connectionManager.getApiClient(serverId);
+    const apiClient = connectionManager.getApiClient(serverId);
 
-        var method = isPlayed ? 'markPlayed' : 'markUnplayed';
+    const method = isPlayed ? 'markPlayed' : 'markUnplayed';
 
     return apiClient[method](apiClient.getCurrentUserId(), id, new Date());
-    }
+}
 
-    function favorite(id, serverId, isFavorite) {
+function favorite(id, serverId, isFavorite) {
-        var apiClient = connectionManager.getApiClient(serverId);
+    const apiClient = connectionManager.getApiClient(serverId);
 
     return apiClient.updateFavoriteStatus(apiClient.getCurrentUserId(), id, isFavorite);
-    }
+}
 
-    function clearLike(id, serverId) {
+function clearLike(id, serverId) {
-        var apiClient = connectionManager.getApiClient(serverId);
+    const apiClient = connectionManager.getApiClient(serverId);
 
     return apiClient.clearUserItemRating(apiClient.getCurrentUserId(), id);
-    }
+}
 
-    return {
+export default {
     fill: fill,
     destroy: destroy,
     getIconsHtml: getIconsHtml
-    };
+};
-});

src/components/viewSettings/viewSettings.js

@@ -1,58 +1,66 @@
-define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectionManager', 'appRouter', 'globalize', 'userSettings', 'emby-checkbox', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button', 'flexStyles'], function (require, dialogHelper, loading, appHost, layoutManager, connectionManager, appRouter, globalize, userSettings) {
+import dialogHelper from 'dialogHelper';
-    'use strict';
+import layoutManager from 'layoutManager';
+import globalize from 'globalize';
+import * as userSettings from 'userSettings';
+import 'emby-checkbox';
+import 'emby-input';
+import 'paper-icon-button-light';
+import 'emby-select';
+import 'material-icons';
+import 'css!./../formdialog';
+import 'emby-button';
+import 'flexStyles';
 
-    function onSubmit(e) {
+function onSubmit(e) {
     e.preventDefault();
     return false;
-    }
+}
 
-    function initEditor(context, settings) {
+function initEditor(context, settings) {
     context.querySelector('form').addEventListener('submit', onSubmit);
 
-        var elems = context.querySelectorAll('.viewSetting-checkboxContainer');
+    const elems = context.querySelectorAll('.viewSetting-checkboxContainer');
 
-        for (var i = 0, length = elems.length; i < length; i++) {
+    for (const elem of elems) {
-            elems[i].querySelector('input').checked = settings[elems[i].getAttribute('data-settingname')] || false;
+        elem.querySelector('input').checked = settings[elem.getAttribute('data-settingname')] || false;
     }
 
     context.querySelector('.selectImageType').value = settings.imageType || 'primary';
-    }
+}
 
-    function saveValues(context, settings, settingsKey) {
+function saveValues(context, settings, settingsKey) {
-        var elems = context.querySelectorAll('.viewSetting-checkboxContainer');
+    const elems = context.querySelectorAll('.viewSetting-checkboxContainer');
-        for (var i = 0, length = elems.length; i < length; i++) {
+    for (const elem of elems) {
-            userSettings.set(settingsKey + '-' + elems[i].getAttribute('data-settingname'), elems[i].querySelector('input').checked);
+        userSettings.set(settingsKey + '-' + elem.getAttribute('data-settingname'), elem.querySelector('input').checked);
     }
 
     userSettings.set(settingsKey + '-imageType', context.querySelector('.selectImageType').value);
-    }
+}
 
-    function centerFocus(elem, horiz, on) {
+function centerFocus(elem, horiz, on) {
-        require(['scrollHelper'], function (scrollHelper) {
+    import('scrollHelper').then(({default: scrollHelper}) => {
-            scrollHelper = scrollHelper.default || scrollHelper;
+        const fn = on ? 'on' : 'off';
-            var fn = on ? 'on' : 'off';
         scrollHelper.centerFocus[fn](elem, horiz);
     });
-    }
+}
 
-    function showIfAllowed(context, selector, visible) {
+function showIfAllowed(context, selector, visible) {
-        var elem = context.querySelector(selector);
+    const elem = context.querySelector(selector);
 
     if (visible && !elem.classList.contains('hiddenFromViewSettings')) {
         elem.classList.remove('hide');
     } else {
         elem.classList.add('hide');
     }
+}
+
+class ViewSettings {
+    constructor() {
     }
-
+    show(options) {
-    function ViewSettings() {
-
-    }
-
-    ViewSettings.prototype.show = function (options) {
         return new Promise(function (resolve, reject) {
-            require(['text!./viewSettings.template.html'], function (template) {
+            import('text!./viewSettings.template.html').then(({default: template}) => {
-                var dialogOptions = {
+                const dialogOptions = {
                     removeOnClose: true,
                     scrollY: false
                 };
@@ -63,11 +71,11 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
                     dialogOptions.size = 'small';
                 }
 
-                var dlg = dialogHelper.createDialog(dialogOptions);
+                const dlg = dialogHelper.createDialog(dialogOptions);
 
                 dlg.classList.add('formDialog');
 
-                var html = '';
+                let html = '';
 
                 html += '<div class="formDialogHeader">';
                 html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
@@ -79,14 +87,14 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
 
                 dlg.innerHTML = globalize.translateHtml(html, 'core');
 
-                var settingElements = dlg.querySelectorAll('.viewSetting');
+                const settingElements = dlg.querySelectorAll('.viewSetting');
-                for (var i = 0, length = settingElements.length; i < length; i++) {
+                for (const settingElement of settingElements) {
-                    if (options.visibleSettings.indexOf(settingElements[i].getAttribute('data-settingname')) === -1) {
+                    if (options.visibleSettings.indexOf(settingElement.getAttribute('data-settingname')) === -1) {
-                        settingElements[i].classList.add('hide');
+                        settingElement.classList.add('hide');
-                        settingElements[i].classList.add('hiddenFromViewSettings');
+                        settingElement.classList.add('hiddenFromViewSettings');
                     } else {
-                        settingElements[i].classList.remove('hide');
+                        settingElement.classList.remove('hide');
-                        settingElements[i].classList.remove('hiddenFromViewSettings');
+                        settingElement.classList.remove('hiddenFromViewSettings');
                     }
                 }
 
@@ -105,7 +113,7 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
                     centerFocus(dlg.querySelector('.formDialogContent'), false, true);
                 }
 
-                var submitted;
+                let submitted;
 
                 dlg.querySelector('.selectImageType').dispatchEvent(new CustomEvent('change', {}));
 
@@ -128,7 +136,7 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
                 });
             });
         });
-    };
+    }
+}
 
-    return ViewSettings;
+export default ViewSettings;
-});

src/controllers/dashboard/apikeys.html

@@ -3,7 +3,7 @@
         <div class="content-primary">
             <div class="detailSectionHeader">
                 <h2 style="margin:.6em 0;vertical-align:middle;display:inline-block;">${HeaderApiKeys}</h2>
-                <button is="emby-button" type="button" class="fab btnNewKey submit" style="margin-left:1em;" title="${ButtonAdd}">
+                <button is="emby-button" type="button" class="fab btnNewKey submit" style="margin-left:1em;" title="${Add}">
                     <span class="material-icons add" aria-hidden="true"></span>
                 </button>
             </div>

src/controllers/dashboard/dashboard.js

@@ -24,7 +24,7 @@ import 'emby-itemscontainer';
     function showPlaybackInfo(btn, session) {
         import('alert').then(({default: alert}) => {
             let title;
-            let text = [];
+            const text = [];
             const displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session);
 
             if (displayPlayMethod === 'DirectStream') {
@@ -737,7 +737,7 @@ import 'emby-itemscontainer';
         shutdown: function (btn) {
             import('confirm').then(({default: confirm}) => {
                 confirm({
-                    title: globalize.translate('HeaderShutdown'),
+                    title: globalize.translate('ButtonShutdown'),
                     text: globalize.translate('MessageConfirmShutdown'),
                     confirmText: globalize.translate('ButtonShutdown'),
                     primary: 'delete'

src/controllers/dashboard/devices/device.html

@@ -15,7 +15,7 @@
                 </div>
                 <div>
                     <button is="emby-button" type="submit" class="raised button-submit block">
-                        <span>${ButtonSave}</span>
+                        <span>${Save}</span>
                     </button>
                 </div>
             </form>

src/controllers/dashboard/devices/devices.html

@@ -3,7 +3,7 @@
         <div class="content-primary">
             <div class="verticalSection verticalSection">
                 <div class="sectionTitleContainer sectionTitleContainer-cards flex align-items-center">
-                    <h2 class="sectionTitle sectionTitle-cards">${TabDevices}</h2>
+                    <h2 class="sectionTitle sectionTitle-cards">${HeaderDevices}</h2>
                     <a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/devices.html">${Help}</a>
                 </div>
             </div>

src/controllers/dashboard/devices/devices.js

@@ -21,7 +21,7 @@ import 'cardStyle';
             confirm({
                 text: msg,
                 title: globalize.translate('HeaderDeleteDevice'),
-                confirmText: globalize.translate('ButtonDelete'),
+                confirmText: globalize.translate('Delete'),
                 primary: 'delete'
             }).then(function () {
                 loading.show();
@@ -38,7 +38,7 @@ import 'cardStyle';
     }
 
     function showDeviceMenu(view, btn, deviceId) {
-        let menuItems = [];
+        const menuItems = [];
 
         if (canEdit) {
             menuItems.push({

src/controllers/dashboard/dlna/profile.html

@@ -10,7 +10,7 @@
                 <div data-role="controlgroup" data-type="horizontal" data-mini="true">
                     <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioInfo" data-value="tabInfo">${TabInfo}</a>
                     <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioDirectPlay" data-value="tabDirectPlayProfiles">${TabDirectPlay}</a>
-                    <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioTranscoding" data-value="tabTranscodingProfiles">${TabTranscoding}</a>
+                    <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioTranscoding" data-value="tabTranscodingProfiles">${Transcoding}</a>
                     <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioContainers" data-value="tabContainerProfiles">${TabContainers}</a>
                     <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioCodecs" data-value="tabCodecProfiles">${TabCodecs}</a>
                     <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioMediaProfiles" data-value="tabMediaProfiles">${TabResponses}</a>
@@ -96,14 +96,14 @@
                             </div>
                             <div>
                                 <h2 style="vertical-align:middle;display:inline-block;">${HeaderHttpHeaders}</h2>
-                                <button is="emby-button" type="button" class="fab btnAddIdentificationHttpHeader submit sectionTitleButton" style="margin-left:1em;" title="${ButtonAdd}">
+                                <button is="emby-button" type="button" class="fab btnAddIdentificationHttpHeader submit sectionTitleButton" style="margin-left:1em;" title="${Add}">
                                     <span class="material-icons add"></span>
                                 </button>
                             </div>
                             <div class="httpHeaderIdentificationList"></div>
                         </div>
                     </div>
-                    <div is="emby-collapse" title="${HeaderDisplay}">
+                    <div is="emby-collapse" title="${Display}">
                         <div class="collapseContent">
                             <br />
                             <div class="checkboxContainer checkboxContainer-withDescription">
@@ -209,7 +209,7 @@
                         <div class="collapseContent">
                             <p>${HeaderSubtitleProfilesHelp}</p>
                             <button is="emby-button" type="button" class="raised submit block btnAddSubtitleProfile">
-                                <span>${ButtonAdd}</span>
+                                <span>${Add}</span>
                             </button>
                             <div class="subtitleProfileList"></div>
                             <br />
@@ -219,7 +219,7 @@
                         <div class="collapseContent">
                             <div>
                                 <h2 style="vertical-align:middle;display:inline-block;">${HeaderXmlDocumentAttributes}</h2>
-                                <button is="emby-button" type="button" class="fab btnAddXmlDocumentAttribute submit sectionTitleButton" style="margin-left:1em;" title="${ButtonAdd}">
+                                <button is="emby-button" type="button" class="fab btnAddXmlDocumentAttribute submit sectionTitleButton" style="margin-left:1em;" title="${Add}">
                                     <span class="material-icons add"></span>
                                 </button>
                             </div>
@@ -231,38 +231,38 @@
                 </div>
                 <div class="tabContent tabDirectPlayProfiles">
                     <p>${HeaderDirectPlayProfileHelp}</p>
-                    <button is="emby-button" class="raised submit block btnAddDirectPlayProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button>
+                    <button is="emby-button" class="raised submit block btnAddDirectPlayProfile" type="button" data-mini="true" data-icon="plus">${New}</button>
                     <br />
                     <div class="directPlayProfiles"></div>
                 </div>
                 <div class="tabContent tabTranscodingProfiles">
                     <p>${HeaderTranscodingProfileHelp}</p>
-                    <button is="emby-button" class="raised submit block btnAddTranscodingProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button>
+                    <button is="emby-button" class="raised submit block btnAddTranscodingProfile" type="button" data-mini="true" data-icon="plus">${New}</button>
                     <br />
                     <div class="transcodingProfiles"></div>
                 </div>
                 <div class="tabContent tabContainerProfiles">
                     <p>${HeaderContainerProfileHelp}</p>
-                    <button is="emby-button" class="raised submit block btnAddContainerProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button>
+                    <button is="emby-button" class="raised submit block btnAddContainerProfile" type="button" data-mini="true" data-icon="plus">${New}</button>
                     <br />
                     <div class="containerProfiles"></div>
                 </div>
                 <div class="tabContent tabCodecProfiles">
                     <p>${HeaderCodecProfileHelp}</p>
-                    <button is="emby-button" class="raised submit block btnAddCodecProfile" type="button" data-icon="plus">${ButtonNew}</button>
+                    <button is="emby-button" class="raised submit block btnAddCodecProfile" type="button" data-icon="plus">${New}</button>
                     <br />
                     <div class="codecProfiles"></div>
                 </div>
                 <div class="tabContent tabMediaProfiles">
                     <p>${HeaderResponseProfileHelp}</p>
-                    <button is="emby-button" class="raised submit block btnAddResponseProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button>
+                    <button is="emby-button" class="raised submit block btnAddResponseProfile" type="button" data-mini="true" data-icon="plus">${New}</button>
                     <br />
                     <div class="mediaProfiles"></div>
                 </div>
                 <br />
                 <div>
                     <button is="emby-button" type="submit" class="raised button-submit block">
-                        <span>${ButtonSave}</span>
+                        <span>${Save}</span>
                     </button>
                     <button is="emby-button" type="button" class="button-cancel raised block" onclick="Dashboard.navigate('dlnaprofiles.html');">
                         <span>${ButtonCancel}</span>

src/controllers/dashboard/dlna/profile.js

@@ -315,7 +315,7 @@ import 'listViewStyle';
         let currentType;
 
         for (let i = 0, length = profiles.length; i < length; i++) {
-            let profile = profiles[i];
+            const profile = profiles[i];
 
             if (profile.Type !== currentType) {
                 html += '<li data-role="list-divider">' + profile.Type + '</li>';
@@ -401,7 +401,7 @@ import 'listViewStyle';
         let currentType;
 
         for (let i = 0, length = profiles.length; i < length; i++) {
-            let profile = profiles[i];
+            const profile = profiles[i];
 
             if (profile.Type !== currentType) {
                 html += '<li data-role="list-divider">' + profile.Type + '</li>';
@@ -472,7 +472,7 @@ import 'listViewStyle';
         let currentType;
 
         for (let i = 0, length = profiles.length; i < length; i++) {
-            let profile = profiles[i];
+            const profile = profiles[i];
             const type = profile.Type.replace('VideoAudio', 'Video Audio');
 
             if (type !== currentType) {
@@ -696,7 +696,7 @@ import 'listViewStyle';
     let currentProfile;
     let currentSubProfile;
     let isSubProfileNew;
-    const allText = globalize.translate('LabelAll');
+    const allText = globalize.translate('All');
 
     $(document).on('pageinit', '#dlnaProfilePage', function () {
         const page = this;

src/controllers/dashboard/dlna/profiles.js

@@ -36,7 +36,7 @@ import 'emby-button';
         }
 
         for (let i = 0, length = profiles.length; i < length; i++) {
-            let profile = profiles[i];
+            const profile = profiles[i];
             html += '<div class="listItem listItem-border">';
             html += '<span class="listItemIcon material-icons live_tv"></span>';
             html += '<div class="listItemBody two-line">';
@@ -46,7 +46,7 @@ import 'emby-button';
             html += '</div>';
 
             if (profile.Type == 'User') {
-                html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile" data-profileid="' + profile.Id + '" title="' + globalize.translate('ButtonDelete') + '"><span class="material-icons delete"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile" data-profileid="' + profile.Id + '" title="' + globalize.translate('Delete') + '"><span class="material-icons delete"></span></button>';
             }
 
             html += '</div>';

src/controllers/dashboard/dlna/settings.html

@@ -59,7 +59,7 @@
                 </div>
                 <div>
                     <button is="emby-button" type="submit" class="raised button-submit block">
-                        <span>${ButtonSave}</span>
+                        <span>${Save}</span>
                     </button>
                 </div>
             </form>

src/controllers/dashboard/encodingsettings.html

@@ -4,7 +4,7 @@
             <form class="encodingSettingsForm">
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
-                        <h2 class="sectionTitle">${TabTranscoding}</h2>
+                        <h2 class="sectionTitle">${Transcoding}</h2>
                         <a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/transcoding.html">${Help}</a>
                     </div>
                 </div>
@@ -176,7 +176,7 @@
 
                 <div>
                     <button is="emby-button" type="submit" class="raised button-submit block">
-                        <span>${ButtonSave}</span>
+                        <span>${Save}</span>
                     </button>
                 </div>
             </form>

src/controllers/dashboard/encodingsettings.js

@@ -45,10 +45,10 @@ import libraryMenu from 'libraryMenu';
             return ApiClient.ajax({
                 url: ApiClient.getUrl('System/MediaEncoder/Path'),
                 type: 'POST',
-                data: {
+                data: JSON.stringify({
                     Path: form.querySelector('.txtEncoderPath').value,
                     PathType: 'Custom'
-                }
+                })
             }).then(Dashboard.processServerConfigurationUpdateResult, onSaveEncodingPathFailure);
         });
     }

src/controllers/dashboard/general.html

@@ -19,7 +19,7 @@
                         <div class="fieldDescription">
                             <div>${LabelPreferredDisplayLanguageHelp}</div>
                             <div style="margin-top: .25em;">
-                                <a is="emby-linkbutton" rel="noopener noreferrer" class="button-link" href="https://docs.jellyfin.org/general/contributing/index.html" target="_blank">${LabelReadHowYouCanContribute}</a>
+                                <a is="emby-linkbutton" rel="noopener noreferrer" class="button-link" href="https://docs.jellyfin.org/general/contributing/index.html" target="_blank">${LearnHowYouCanContribute}</a>
                             </div>
                         </div>
                     </div>
@@ -63,7 +63,7 @@
                 <br />
                 <div>
                     <button is="emby-button" type="submit" class="raised button-submit block">
-                        <span>${ButtonSave}</span>
+                        <span>${Save}</span>
                     </button>
                 </div>
             </form>

src/controllers/dashboard/library.js

@@ -363,10 +363,10 @@ import 'emby-itemrefreshindicator';
             name: globalize.translate('HeaderLibraries')
         }, {
             href: 'librarydisplay.html',
-            name: globalize.translate('TabDisplay')
+            name: globalize.translate('Display')
         }, {
             href: 'metadataimages.html',
-            name: globalize.translate('TabMetadata')
+            name: globalize.translate('Metadata')
         }, {
             href: 'metadatanfo.html',
             name: globalize.translate('TabNfoSettings')

src/controllers/dashboard/librarydisplay.html

@@ -49,7 +49,7 @@
 
                 <br/>
                 <button is="emby-button" type="submit" class="raised button-submit block">
-                    <span>${ButtonSave}</span>
+                    <span>${Save}</span>
                 </button>
             </form>
         </div>

src/controllers/dashboard/librarydisplay.js

@@ -12,10 +12,10 @@ import 'emby-button';
             name: globalize.translate('HeaderLibraries')
         }, {
             href: 'librarydisplay.html',
-            name: globalize.translate('TabDisplay')
+            name: globalize.translate('Display')
         }, {
             href: 'metadataimages.html',
-            name: globalize.translate('TabMetadata')
+            name: globalize.translate('Metadata')
         }, {
             href: 'metadatanfo.html',
             name: globalize.translate('TabNfoSettings')

src/controllers/dashboard/metadataImages.js

@@ -55,10 +55,10 @@ import 'listViewStyle';
             name: globalize.translate('HeaderLibraries')
         }, {
             href: 'librarydisplay.html',
-            name: globalize.translate('TabDisplay')
+            name: globalize.translate('Display')
         }, {
             href: 'metadataimages.html',
-            name: globalize.translate('TabMetadata')
+            name: globalize.translate('Metadata')
         }, {
             href: 'metadatanfo.html',
             name: globalize.translate('TabNfoSettings')

src/controllers/dashboard/metadataimages.html

@@ -17,7 +17,7 @@
                     <select is="emby-select" id="selectCountry" required="required" label="${LabelCountry}"></select>
                 </div>
                 <br />
-                <div><button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button></div>
+                <div><button is="emby-button" type="submit" class="raised button-submit block"><span>${Save}</span></button></div>
             </form>
         </div>
 

src/controllers/dashboard/metadatanfo.html

@@ -41,7 +41,7 @@
                     </label>
                     <div class="fieldDescription checkboxFieldDescription">${LabelKodiMetadataEnableExtraThumbsHelp}</div>
                 </div>
-                <div><button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button></div>
+                <div><button is="emby-button" type="submit" class="raised button-submit block"><span>${Save}</span></button></div>
             </form>
         </div>
 

src/controllers/dashboard/metadatanfo.js

@@ -52,10 +52,10 @@ import globalize from 'globalize';
             name: globalize.translate('HeaderLibraries')
         }, {
             href: 'librarydisplay.html',
-            name: globalize.translate('TabDisplay')
+            name: globalize.translate('Display')
         }, {
             href: 'metadataimages.html',
-            name: globalize.translate('TabMetadata')
+            name: globalize.translate('Metadata')
         }, {
             href: 'metadatanfo.html',
             name: globalize.translate('TabNfoSettings')

src/controllers/dashboard/networking.html

@@ -112,7 +112,7 @@
                 </div>
                 <div>
                     <button is="emby-button" type="submit" class="raised button-submit block">
-                        <span>${ButtonSave}</span>
+                        <span>${Save}</span>
                     </button>
                 </div>
             </form>

src/controllers/dashboard/notifications/notification/index.html

@@ -54,7 +54,7 @@
                 <div>
                     <br />
                     <button is="emby-button" type="submit" class="raised button-submit block">
-                        <span>${ButtonSave}</span>
+                        <span>${Save}</span>
                     </button>
 
                     <button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();">

src/controllers/dashboard/playback.html

@@ -23,7 +23,7 @@
                         ${LabelMinResumeDurationHelp}
                     </div>
                 </div>
-                <div><button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button></div>
+                <div><button is="emby-button" type="submit" class="raised button-submit block"><span>${Save}</span></button></div>
             </form>
         </div>
     </div>

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

@@ -1,43 +1,43 @@
-define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'emby-button'], function ($, loading, libraryMenu, globalize, connectionManager) {
+import $ from 'jQuery';
-    'use strict';
+import loading from 'loading';
+import globalize from 'globalize';
+import 'emby-button';
 
-    loading = loading.default || loading;
+function populateHistory(packageInfo, page) {
+    let html = '';
+    const length = Math.min(packageInfo.versions.length, 10);
 
-    function populateHistory(packageInfo, page) {
+    for (let i = 0; i < length; i++) {
-        var html = '';
+        const version = packageInfo.versions[i];
-        var length = Math.min(packageInfo.versions.length, 10);
-
-        for (var i = 0; i < length; i++) {
-            var version = packageInfo.versions[i];
         html += '<h2 style="margin:.5em 0;">' + version.version + '</h2>';
         html += '<div style="margin-bottom:1.5em;">' + version.changelog + '</div>';
     }
 
     $('#revisionHistory', page).html(html);
-    }
+}
 
-    function populateVersions(packageInfo, page, installedPlugin) {
+function populateVersions(packageInfo, page, installedPlugin) {
-        var html = '';
+    let html = '';
 
-        for (var i = 0; i < packageInfo.versions.length; i++) {
+    for (let i = 0; i < packageInfo.versions.length; i++) {
-            var version = packageInfo.versions[i];
+        const version = packageInfo.versions[i];
         html += '<option value="' + version.version + '">' + version.version + '</option>';
     }
 
-        var selectmenu = $('#selectVersion', page).html(html);
+    const selectmenu = $('#selectVersion', page).html(html);
 
     if (!installedPlugin) {
         $('#pCurrentVersion', page).hide().html('');
     }
 
-        var packageVersion = packageInfo.versions[0];
+    const packageVersion = packageInfo.versions[0];
     if (packageVersion) {
         selectmenu.val(packageVersion.version);
     }
-    }
+}
 
-    function renderPackage(pkg, installedPlugins, page) {
+function renderPackage(pkg, installedPlugins, page) {
-        var installedPlugin = installedPlugins.filter(function (ip) {
+    const installedPlugin = installedPlugins.filter(function (ip) {
         return ip.Name == pkg.name;
     })[0];
 
@@ -58,64 +58,66 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'e
     $('#developer', page).html(pkg.owner);
 
     if (installedPlugin) {
-            var currentVersionText = globalize.translate('MessageYouHaveVersionInstalled', '<strong>' + installedPlugin.Version + '</strong>');
+        const currentVersionText = globalize.translate('MessageYouHaveVersionInstalled', '<strong>' + installedPlugin.Version + '</strong>');
         $('#pCurrentVersion', page).show().html(currentVersionText);
     } else {
         $('#pCurrentVersion', page).hide().html('');
     }
 
     loading.hide();
-    }
+}
 
-    function alertText(options) {
+function alertText(options) {
-        require(['alert'], function ({default: alert}) {
+    import('alert').then(({default: alert}) => {
         alert(options);
     });
-    }
+}
 
-    function performInstallation(page, name, guid, version) {
+function performInstallation(page, name, guid, version) {
-        var developer = $('#developer', page).html().toLowerCase();
+    const developer = $('#developer', page).html().toLowerCase();
 
-        var alertCallback = function () {
+    const alertCallback = function () {
         loading.show();
         page.querySelector('#btnInstall').disabled = true;
-            ApiClient.installPlugin(name, guid, version).then(function () {
+        ApiClient.installPlugin(name, guid, version).then(() => {
             loading.hide();
             alertText(globalize.translate('MessagePluginInstalled'));
+        }).catch(() => {
+            alertText(globalize.translate('MessagePluginInstallError'));
         });
     };
 
     if (developer !== 'jellyfin') {
         loading.hide();
-            var msg = globalize.translate('MessagePluginInstallDisclaimer');
+        let msg = globalize.translate('MessagePluginInstallDisclaimer');
         msg += '<br/>';
         msg += '<br/>';
         msg += globalize.translate('PleaseConfirmPluginInstallation');
 
-            require(['confirm'], function (confirm) {
+        import('confirm').then(({default: confirm}) => {
-                confirm.default(msg, globalize.translate('HeaderConfirmPluginInstallation')).then(function () {
+            confirm(msg, globalize.translate('HeaderConfirmPluginInstallation')).then(function () {
                 alertCallback();
-                }, function () {
+            }).catch(() => {
                 console.debug('plugin not installed');
             });
         });
     } else {
         alertCallback();
     }
-    }
+}
 
-    return function (view, params) {
+export default function(view, params) {
     $('.addPluginForm', view).on('submit', function () {
         loading.show();
-            var page = $(this).parents('#addPluginPage')[0];
+        const page = $(this).parents('#addPluginPage')[0];
-            var name = params.name;
+        const name = params.name;
-            var guid = params.guid;
+        const guid = params.guid;
         ApiClient.getInstalledPlugins().then(function (plugins) {
-                var installedPlugin = plugins.filter(function (plugin) {
+            const installedPlugin = plugins.filter(function (plugin) {
                 return plugin.Name == name;
             })[0];
 
-                var version = $('#selectVersion', page).val();
+            const version = $('#selectVersion', page).val();
             if (installedPlugin && installedPlugin.Version === version) {
                 loading.hide();
                 Dashboard.alert({
@@ -125,19 +127,20 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'e
             } else {
                 performInstallation(page, name, guid, version);
             }
+        }).catch(() => {
+            alertText(globalize.translate('MessageGetInstalledPluginsError'));
         });
         return false;
     });
     view.addEventListener('viewshow', function () {
-            var page = this;
+        const page = this;
         loading.show();
-            var name = params.name;
+        const name = params.name;
-            var guid = params.guid;
+        const guid = params.guid;
-            var promise1 = ApiClient.getPackageInfo(name, guid);
+        const promise1 = ApiClient.getPackageInfo(name, guid);
-            var promise2 = ApiClient.getInstalledPlugins();
+        const promise2 = ApiClient.getInstalledPlugins();
         Promise.all([promise1, promise2]).then(function (responses) {
             renderPackage(responses[0], responses[1], page);
         });
     });
-    };
+}
-});

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

@@ -1,12 +1,15 @@
-define(['loading', 'libraryMenu', 'globalize', 'cardStyle', 'emby-button', 'emby-checkbox', 'emby-select'], function (loading, libraryMenu, globalize) {
+import loading from 'loading';
-    'use strict';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+import 'cardStyle';
+import 'emby-button';
+import 'emby-checkbox';
+import 'emby-select';
 
-    loading = loading.default || loading;
+function reloadList(page) {
-
-    function reloadList(page) {
     loading.show();
-        var promise1 = ApiClient.getAvailablePlugins();
+    const promise1 = ApiClient.getAvailablePlugins();
-        var promise2 = ApiClient.getInstalledPlugins();
+    const promise2 = ApiClient.getInstalledPlugins();
     Promise.all([promise1, promise2]).then(function (responses) {
         populateList({
             catalogElement: page.querySelector('#pluginTiles'),
@@ -15,26 +18,27 @@ define(['loading', 'libraryMenu', 'globalize', 'cardStyle', 'emby-button', 'emby
             installedPlugins: responses[1]
         });
     });
-    }
+}
 
-    function getHeaderText(category) {
+function getHeaderText(category) {
     category = category.replace(' ', '');
+    // TODO: Replace with switch
     if (category === 'Channel') {
         category = 'Channels';
     } else if (category === 'Theme') {
         category = 'Themes';
     } else if (category === 'LiveTV') {
-            category = 'HeaderLiveTV';
+        category = 'LiveTV';
     } else if (category === 'ScreenSaver') {
         category = 'HeaderScreenSavers';
     }
 
     return globalize.translate(category);
-    }
+}
 
-    function populateList(options) {
+function populateList(options) {
-        var availablePlugins = options.availablePlugins;
+    const availablePlugins = options.availablePlugins;
-        var installedPlugins = options.installedPlugins;
+    const installedPlugins = options.installedPlugins;
 
     availablePlugins.forEach(function (plugin, index, array) {
         plugin.category = plugin.category || 'General';
@@ -56,12 +60,12 @@ define(['loading', 'libraryMenu', 'globalize', 'cardStyle', 'emby-button', 'emby
         return 0;
     });
 
-        var currentCategory = null;
+    let currentCategory = null;
-        var html = '';
+    let html = '';
 
-        for (var i = 0; i < availablePlugins.length; i++) {
+    for (let i = 0; i < availablePlugins.length; i++) {
-            var plugin = availablePlugins[i];
+        const plugin = availablePlugins[i];
-            var category = plugin.categoryDisplayName;
+        const category = plugin.categoryDisplayName;
         if (category != currentCategory) {
             if (currentCategory) {
                 html += '</div>';
@@ -83,17 +87,17 @@ define(['loading', 'libraryMenu', 'globalize', 'cardStyle', 'emby-button', 'emby
 
     options.catalogElement.innerHTML = html;
     loading.hide();
-    }
+}
 
-    function getPluginHtml(plugin, options, installedPlugins) {
+function getPluginHtml(plugin, options, installedPlugins) {
-        var html = '';
+    let html = '';
-        var href = plugin.externalUrl ? plugin.externalUrl : 'addplugin.html?name=' + encodeURIComponent(plugin.name) + '&guid=' + plugin.guid;
+    let href = plugin.externalUrl ? plugin.externalUrl : 'addplugin.html?name=' + encodeURIComponent(plugin.name) + '&guid=' + plugin.guid;
 
     if (options.context) {
         href += '&context=' + options.context;
     }
 
-        var target = plugin.externalUrl ? ' target="_blank"' : '';
+    const target = plugin.externalUrl ? ' target="_blank"' : '';
     html += "<div class='card backdropCard'>";
     html += '<div class="cardBox visualCardBox">';
     html += '<div class="cardScalable visualCardBox-cardScalable">';
@@ -106,7 +110,7 @@ define(['loading', 'libraryMenu', 'globalize', 'cardStyle', 'emby-button', 'emby
     html += "<div class='cardText'>";
     html += plugin.name;
     html += '</div>';
-        var installedPlugin = installedPlugins.filter(function (ip) {
+    const installedPlugin = installedPlugins.filter(function (ip) {
         return ip.Id == plugin.guid;
     })[0];
     html += "<div class='cardText cardText-secondary'>";
@@ -115,9 +119,9 @@ define(['loading', 'libraryMenu', 'globalize', 'cardStyle', 'emby-button', 'emby
     html += '</div>';
     html += '</div>';
     return html += '</div>';
-    }
+}
 
-    function getTabs() {
+function getTabs() {
     return [{
         href: 'installedplugins.html',
         name: globalize.translate('TabMyPlugins')
@@ -128,16 +132,11 @@ define(['loading', 'libraryMenu', 'globalize', 'cardStyle', 'emby-button', 'emby
         href: 'repositories.html',
         name: globalize.translate('TabRepositories')
     }];
-    }
+}
 
-    window.PluginCatalog = {
+export default function (view) {
-        renderCatalog: populateList
-    };
-
-    return function (view, params) {
     view.addEventListener('viewshow', function () {
         libraryMenu.setTabs('plugins', 1, getTabs);
         reloadList(this);
     });
-    };
+}
-});

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

@@ -1,12 +1,14 @@
-define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'], function (loading, libraryMenu, dom, globalize) {
+import loading from 'loading';
-    'use strict';
+import libraryMenu from 'libraryMenu';
+import dom from 'dom';
+import globalize from 'globalize';
+import 'cardStyle';
+import 'emby-button';
 
-    loading = loading.default || loading;
+function deletePlugin(page, uniqueid, name) {
+    const msg = globalize.translate('UninstallPluginConfirmation', name);
 
-    function deletePlugin(page, uniqueid, name) {
+    import('confirm').then(({default: confirm}) => {
-        var msg = globalize.translate('UninstallPluginConfirmation', name);
-
-        require(['confirm'], function (confirm) {
         confirm.default({
             title: globalize.translate('HeaderUninstallPlugin'),
             text: msg,
@@ -19,26 +21,26 @@ define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'
             });
         });
     });
-    }
+}
 
-    function showNoConfigurationMessage() {
+function showNoConfigurationMessage() {
     Dashboard.alert({
         message: globalize.translate('MessageNoPluginConfiguration')
     });
-    }
+}
 
-    function showConnectMessage() {
+function showConnectMessage() {
     Dashboard.alert({
         message: globalize.translate('MessagePluginConfigurationRequiresLocalAccess')
     });
-    }
+}
 
-    function getPluginCardHtml(plugin, pluginConfigurationPages) {
+function getPluginCardHtml(plugin, pluginConfigurationPages) {
-        var configPage = pluginConfigurationPages.filter(function (pluginConfigurationPage) {
+    const configPage = pluginConfigurationPages.filter(function (pluginConfigurationPage) {
         return pluginConfigurationPage.PluginId == plugin.Id;
     })[0];
-        var configPageUrl = configPage ? Dashboard.getConfigurationPageUrl(configPage.Name) : null;
+    const configPageUrl = configPage ? Dashboard.getConfigurationPageUrl(configPage.Name) : null;
-        var html = '';
+    let html = '';
     html += "<div data-id='" + plugin.Id + "' data-name='" + plugin.Name + "' data-removable='" + plugin.CanUninstall + "' class='card backdropCard'>";
     html += '<div class="cardBox visualCardBox">';
     html += '<div class="cardScalable">';
@@ -65,15 +67,15 @@ define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'
     html += '</div>';
     html += '</div>';
     return html;
-    }
+}
 
-    function renderPlugins(page, plugins) {
+function renderPlugins(page, plugins) {
     ApiClient.getJSON(ApiClient.getUrl('web/configurationpages') + '?pageType=PluginConfiguration').then(function (configPages) {
         populateList(page, plugins, configPages);
     });
-    }
+}
 
-    function populateList(page, plugins, pluginConfigurationPages) {
+function populateList(page, plugins, pluginConfigurationPages) {
     plugins = plugins.sort(function (plugin1, plugin2) {
         if (plugin1.Name > plugin2.Name) {
             return 1;
@@ -82,11 +84,11 @@ define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'
         return -1;
     });
 
-        var html = plugins.map(function (p) {
+    let html = plugins.map(function (p) {
         return getPluginCardHtml(p, pluginConfigurationPages);
     }).join('');
 
-        var installedPluginsElement = page.querySelector('.installedPlugins');
+    const installedPluginsElement = page.querySelector('.installedPlugins');
     installedPluginsElement.removeEventListener('click', onInstalledPluginsClick);
     installedPluginsElement.addEventListener('click', onInstalledPluginsClick);
 
@@ -104,15 +106,15 @@ define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'
 
     installedPluginsElement.innerHTML = html;
     loading.hide();
-    }
+}
 
-    function showPluginMenu(page, elem) {
+function showPluginMenu(page, elem) {
-        var card = dom.parentWithClass(elem, 'card');
+    const card = dom.parentWithClass(elem, 'card');
-        var id = card.getAttribute('data-id');
+    const id = card.getAttribute('data-id');
-        var name = card.getAttribute('data-name');
+    const name = card.getAttribute('data-name');
-        var removable = card.getAttribute('data-removable');
+    const removable = card.getAttribute('data-removable');
-        var configHref = card.querySelector('.cardContent').getAttribute('href');
+    const configHref = card.querySelector('.cardContent').getAttribute('href');
-        var menuItems = [];
+    const menuItems = [];
 
     if (configHref) {
         menuItems.push({
@@ -130,7 +132,7 @@ define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'
         });
     }
 
-        require(['actionsheet'], function (actionsheet) {
+    import('actionsheet').then(({default: actionsheet}) => {
         actionsheet.show({
             items: menuItems,
             positionTo: elem,
@@ -146,16 +148,16 @@ define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'
             }
         });
     });
-    }
+}
 
-    function reloadList(page) {
+function reloadList(page) {
     loading.show();
     ApiClient.getInstalledPlugins().then(function (plugins) {
         renderPlugins(page, plugins);
     });
-    }
+}
 
-    function getTabs() {
+function getTabs() {
     return [{
         href: 'installedplugins.html',
         name: globalize.translate('TabMyPlugins')
@@ -166,27 +168,26 @@ define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'
         href: 'repositories.html',
         name: globalize.translate('TabRepositories')
     }];
-    }
+}
 
-    function onInstalledPluginsClick(e) {
+function onInstalledPluginsClick(e) {
     if (dom.parentWithClass(e.target, 'noConfigPluginCard')) {
         showNoConfigurationMessage();
     } else if (dom.parentWithClass(e.target, 'connectModePluginCard')) {
         showConnectMessage();
     } else {
-            var btnCardMenu = dom.parentWithClass(e.target, 'btnCardMenu');
+        const btnCardMenu = dom.parentWithClass(e.target, 'btnCardMenu');
         if (btnCardMenu) {
             showPluginMenu(dom.parentWithClass(btnCardMenu, 'page'), btnCardMenu);
         }
     }
-    }
+}
 
-    pageIdOn('pageshow', 'pluginsPage', function () {
+pageIdOn('pageshow', 'pluginsPage', function () {
     libraryMenu.setTabs('plugins', 0, getTabs);
     reloadList(this);
-    });
-
-    window.PluginsPage = {
-        renderPlugins: renderPlugins
-    };
 });
+
+window.PluginsPage = {
+    renderPlugins: renderPlugins
+};

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

@@ -3,7 +3,7 @@
         <div class="content-primary">
             <div class="sectionTitleContainer flex align-items-center">
                 <h2 class="sectionTitle">${TabRepositories}</h2>
-                <button is="emby-button" type="button" class="fab btnNewRepository submit" style="margin-left:1em;" title="${ButtonAdd}">
+                <button is="emby-button" type="button" class="fab btnNewRepository submit" style="margin-left:1em;" title="${Add}">
                     <span class="material-icons add" aria-hidden="true"></span>
                 </button>
             </div>

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

@@ -69,7 +69,7 @@ function getRepositoryHtml(repository) {
     html += `<h3 class="listItemBodyText">${repository.Name}</h3>`;
     html += `<div class="listItemBodyText secondary">${repository.Url}</div>`;
     html += '</div>';
-    html += `<button type="button" is="paper-icon-button-light" id="${repository.Url}" class="btnDelete" title="${globalize.translate('ButtonDelete')}"><span class="material-icons delete"></span></button>`;
+    html += `<button type="button" is="paper-icon-button-light" id="${repository.Url}" class="btnDelete" title="${globalize.translate('Delete')}"><span class="material-icons delete"></span></button>`;
     html += '</div>';
 
     return html;
@@ -105,7 +105,7 @@ export default function(view, params) {
     });
 
     view.querySelector('.btnNewRepository').addEventListener('click', () => {
-        let dialog = dialogHelper.createDialog({
+        const dialog = dialogHelper.createDialog({
             scrollY: false,
             size: 'large',
             modal: false,
@@ -127,7 +127,7 @@ export default function(view, params) {
         html += `<input is="emby-input" id="txtRepositoryUrl" label="${globalize.translate('LabelRepositoryUrl')}" type="url" required />`;
         html += `<div class="fieldDescription">${globalize.translate('LabelRepositoryUrlHelp')}</div>`;
         html += '</div>';
-        html += `<button is="emby-button" type="submit" class="raised button-submit block"><span>${globalize.translate('ButtonSave')}</span></button>`;
+        html += `<button is="emby-button" type="submit" class="raised button-submit block"><span>${globalize.translate('Save')}</span></button>`;
         html += '</div>';
         html += '</form>';
 

src/controllers/dashboard/scheduledtasks/scheduledtask.html

@@ -31,18 +31,18 @@
                         <option value="DailyTrigger">${OptionDaily}</option>
                         <option value="WeeklyTrigger">${OptionWeekly}</option>
                         <option value="IntervalTrigger">${OptionOnInterval}</option>
-                        <option value="StartupTrigger">${OptionOnAppStartup}</option>
+                        <option value="StartupTrigger">${OnApplicationStartup}</option>
                     </select>
                 </div>
                 <div id="fldDayOfWeek" class="selectContainer">
                     <select is="emby-select" id="selectDayOfWeek" name="selectDayOfWeek" label="${LabelDay}">
-                        <option value="Sunday">${OptionSunday}</option>
+                        <option value="Sunday">${Sunday}</option>
-                        <option value="Monday">${OptionMonday}</option>
+                        <option value="Monday">${Monday}</option>
-                        <option value="Tuesday">${OptionTuesday}</option>
+                        <option value="Tuesday">${Tuesday}</option>
-                        <option value="Wednesday">${OptionWednesday}</option>
+                        <option value="Wednesday">${Wednesday}</option>
-                        <option value="Thursday">${OptionThursday}</option>
+                        <option value="Thursday">${Thursday}</option>
-                        <option value="Friday">${OptionFriday}</option>
+                        <option value="Friday">${Friday}</option>
-                        <option value="Saturday">${OptionSaturday}</option>
+                        <option value="Saturday">${Saturday}</option>
                     </select>
                 </div>
                 <div id="fldTimeOfDay" class="selectContainer">
@@ -73,7 +73,7 @@
                 </div>
                 <div>
                     <button is="emby-button" type="submit" class="raised button-submit block" data-icon="check">
-                        <span>${ButtonAdd}</span>
+                        <span>${Add}</span>
                     </button>
                     <button is="emby-button" type="button" class="raised button-cancel block" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');">
                         <span>${ButtonCancel}</span>

src/controllers/dashboard/scheduledtasks/scheduledtask.js

@@ -33,7 +33,7 @@ import 'emby-select';
     const ScheduledTaskPage = {
         refreshScheduledTask: function (view) {
             loading.show();
-            let id = getParameterByName('id');
+            const id = getParameterByName('id');
             ApiClient.getScheduledTask(id).then(function (task) {
                 ScheduledTaskPage.loadScheduledTask(view, task);
             });
@@ -75,7 +75,7 @@ import 'emby-select';
                 }
 
                 html += '</div>';
-                html += '<button class="btnDeleteTrigger" data-index="' + i + '" type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonDelete') + '"><span class="material-icons delete"></span></button>';
+                html += '<button class="btnDeleteTrigger" data-index="' + i + '" type="button" is="paper-icon-button-light" title="' + globalize.translate('Delete') + '"><span class="material-icons delete"></span></button>';
                 html += '</div>';
             }
 
@@ -143,7 +143,7 @@ import 'emby-select';
         },
         deleteTrigger: function (view, index) {
             loading.show();
-            let id = getParameterByName('id');
+            const id = getParameterByName('id');
             ApiClient.getScheduledTask(id).then(function (task) {
                 task.Triggers.remove(index);
                 ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).then(function () {
@@ -211,7 +211,7 @@ import 'emby-select';
     export default function (view, params) {
         function onSubmit(e) {
             loading.show();
-            let id = getParameterByName('id');
+            const id = getParameterByName('id');
             ApiClient.getScheduledTask(id).then(function (task) {
                 task.Triggers.push(ScheduledTaskPage.getTriggerToAdd(view));
                 ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).then(function () {

src/controllers/dashboard/scheduledtasks/scheduledtasks.js

@@ -103,7 +103,7 @@ import 'emby-button';
     }
 
     function setTaskButtonIcon(button, icon) {
-        let inner = button.querySelector('.material-icons');
+        const inner = button.querySelector('.material-icons');
         inner.classList.remove('stop', 'play_arrow');
         inner.classList.add(icon);
     }
@@ -160,7 +160,7 @@ import 'emby-button';
 
         $('.divScheduledTasks', view).on('click', '.btnStartTask', function() {
             const button = this;
-            let id = button.getAttribute('data-taskid');
+            const id = button.getAttribute('data-taskid');
             ApiClient.startScheduledTask(id).then(function() {
                 updateTaskButton(button, 'Running');
                 reloadList(view);
@@ -169,7 +169,7 @@ import 'emby-button';
 
         $('.divScheduledTasks', view).on('click', '.btnStopTask', function() {
             const button = this;
-            let id = button.getAttribute('data-taskid');
+            const id = button.getAttribute('data-taskid');
             ApiClient.stopScheduledTask(id).then(function() {
                 updateTaskButton(button, '');
                 reloadList(view);

src/controllers/dashboard/streaming.html

@@ -12,7 +12,7 @@
                     </div>
                 </div>
                 <button is="emby-button" type="submit" class="raised button-submit block">
-                    <span>${ButtonSave}</span>
+                    <span>${Save}</span>
                 </button>
             </form>
         </div>

src/controllers/dashboard/users/useredit.html

@@ -14,7 +14,7 @@
                 <a href="#" is="emby-linkbutton" data-role="button" class="ui-btn-active">${TabProfile}</a>
                 <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a>
                 <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
-                <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${TabPassword}</a>
+                <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>
             </div>
             <p class="lnkEditUserPreferencesContainer">
                 <a class="lnkEditUserPreferences button-link" href="#" is="emby-linkbutton">${ButtonEditOtherUserPreferences}</a>
@@ -192,7 +192,7 @@
                 <br />
                 <div>
                     <button is="emby-button" type="submit" class="raised button-submit block">
-                        <span>${ButtonSave}</span>
+                        <span>${Save}</span>
                     </button>
 
                     <button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();">

src/controllers/dashboard/users/userlibraryaccess.html

@@ -14,7 +14,7 @@
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${TabProfile}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);" class="ui-btn-active">${TabAccess}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
-                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${TabPassword}</a>
+                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>
             </div>
             <form class="userLibraryAccessForm">
 
@@ -59,7 +59,7 @@
                 <br />
                 <div>
                     <button is="emby-button" type="submit" class="raised button-submit block">
-                        <span>${ButtonSave}</span>
+                        <span>${Save}</span>
                     </button>
                 </div>
             </form>

src/controllers/dashboard/users/userlibraryaccess.js

@@ -32,7 +32,7 @@ import globalize from 'globalize';
 
     function loadChannels(page, user, channels) {
         let html = '';
-        html += '<h3 class="checkboxListLabel">' + globalize.translate('HeaderChannels') + '</h3>';
+        html += '<h3 class="checkboxListLabel">' + globalize.translate('Channels') + '</h3>';
         html += '<div class="checkboxList paperList checkboxList-paperList">';
 
         for (let i = 0, length = channels.length; i < length; i++) {