Merge pull request #1759 from Camc314/migrate-to-ES6-57

Migration of guide and guide-settings to ES6 modules

package.json

@@ -112,6 +112,8 @@
           "src/components/filterdialog/filterdialog.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",

src/components/guide/guide-settings.js

@@ -1,150 +1,149 @@
-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';
 
-    layoutManager = layoutManager.default || layoutManager;
+function saveCategories(context, options) {
-    scrollHelper = scrollHelper.default || scrollHelper;
+    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++) {
+            categories.push(type);
-            var type = chkCategorys[i].getAttribute('data-type');
-
-            if (chkCategorys[i].checked) {
-                categories.push(type);
-            }
-        }
-
-        if (categories.length >= 4) {
-            categories.push('series');
-        }
-
-        // differentiate between none and all
-        categories.push('all');
-        options.categories = categories;
-    }
-
-    function loadCategories(context, options) {
-        var selectedCategories = options.categories || [];
-
-        var chkCategorys = context.querySelectorAll('.chkCategory');
-        for (var i = 0, length = chkCategorys.length; i < length; i++) {
-            var type = chkCategorys[i].getAttribute('data-type');
-
-            chkCategorys[i].checked = !selectedCategories.length || selectedCategories.indexOf(type) !== -1;
         }
     }
 
-    function save(context) {
+    if (categories.length >= 4) {
-        var i;
+        categories.push('series');
-        var length;
+    }
 
-        var chkIndicators = context.querySelectorAll('.chkIndicator');
+    // differentiate between none and all
-        for (i = 0, length = chkIndicators.length; i < length; i++) {
+    categories.push('all');
-            var type = chkIndicators[i].getAttribute('data-type');
+    options.categories = categories;
-            userSettings.set('guide-indicator-' + type, chkIndicators[i].checked);
+}
+
+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 save(context) {
+    const chkIndicators = context.querySelectorAll('.chkIndicator');
+
+    for (const chkIndicator of chkIndicators) {
+        const type = chkIndicator.getAttribute('data-type');
+        userSettings.set('guide-indicator-' + type, chkIndicator.checked);
+    }
+
+    userSettings.set('guide-colorcodedbackgrounds', context.querySelector('.chkColorCodedBackgrounds').checked);
+    userSettings.set('livetv-favoritechannelsattop', context.querySelector('.chkFavoriteChannelsAtTop').checked);
+
+    const sortBys = context.querySelectorAll('.chkSortOrder');
+    for (const sortBy of sortBys) {
+        if (sortBy.checked) {
+            userSettings.set('livetv-channelorder', sortBy.value);
+            break;
         }
+    }
+}
 
-        userSettings.set('guide-colorcodedbackgrounds', context.querySelector('.chkColorCodedBackgrounds').checked);
+function load(context) {
-        userSettings.set('livetv-favoritechannelsattop', context.querySelector('.chkFavoriteChannelsAtTop').checked);
+    const chkIndicators = context.querySelectorAll('.chkIndicator');
 
-        var sortBys = context.querySelectorAll('.chkSortOrder');
+    for (const chkIndicator of chkIndicators) {
-        for (i = 0, length = sortBys.length; i < length; i++) {
+        const type = chkIndicator.getAttribute('data-type');
-            if (sortBys[i].checked) {
+
-                userSettings.set('livetv-channelorder', sortBys[i].value);
+        if (chkIndicator.getAttribute('data-default') === 'true') {
-                break;
+            chkIndicator.checked = userSettings.get('guide-indicator-' + type) !== 'false';
-            }
+        } else {
+            chkIndicator.checked = userSettings.get('guide-indicator-' + type) === 'true';
         }
     }
 
-    function load(context) {
+    context.querySelector('.chkColorCodedBackgrounds').checked = userSettings.get('guide-colorcodedbackgrounds') === 'true';
-        var i;
+    context.querySelector('.chkFavoriteChannelsAtTop').checked = userSettings.get('livetv-favoritechannelsattop') !== 'false';
-        var length;
 
-        var chkIndicators = context.querySelectorAll('.chkIndicator');
+    const sortByValue = userSettings.get('livetv-channelorder') || 'Number';
-        for (i = 0, length = chkIndicators.length; i < length; i++) {
-            var type = chkIndicators[i].getAttribute('data-type');
 
-            if (chkIndicators[i].getAttribute('data-default') === 'true') {
+    const sortBys = context.querySelectorAll('.chkSortOrder');
-                chkIndicators[i].checked = userSettings.get('guide-indicator-' + type) !== 'false';
+    for (const sortBy of sortBys) {
+        sortBy.checked = sortBy.value === sortByValue;
+    }
+}
+
+function showEditor(options) {
+    return new Promise(function (resolve, reject) {
+        let settingsChanged = false;
+
+        import('text!./guide-settings.template.html').then(({ default: template }) => {
+            const dialogOptions = {
+                removeOnClose: true,
+                scrollY: false
+            };
+
+            if (layoutManager.tv) {
+                dialogOptions.size = 'fullscreen';
             } else {
-                chkIndicators[i].checked = userSettings.get('guide-indicator-' + type) === 'true';
+                dialogOptions.size = 'small';
             }
-        }
 
-        context.querySelector('.chkColorCodedBackgrounds').checked = userSettings.get('guide-colorcodedbackgrounds') === 'true';
+            const dlg = dialogHelper.createDialog(dialogOptions);
-        context.querySelector('.chkFavoriteChannelsAtTop').checked = userSettings.get('livetv-favoritechannelsattop') !== 'false';
 
-        var sortByValue = userSettings.get('livetv-channelorder') || 'Number';
+            dlg.classList.add('formDialog');
 
-        var sortBys = context.querySelectorAll('.chkSortOrder');
+            let html = '';
-        for (i = 0, length = sortBys.length; i < length; i++) {
-            sortBys[i].checked = sortBys[i].value === sortByValue;
-        }
-    }
 
-    function showEditor(options) {
+            html += globalize.translateHtml(template, 'core');
-        return new Promise(function (resolve, reject) {
-            var settingsChanged = false;
 
-            require(['text!./guide-settings.template.html'], function (template) {
+            dlg.innerHTML = html;
-                var dialogOptions = {
-                    removeOnClose: true,
-                    scrollY: false
-                };
 
-                if (layoutManager.tv) {
+            dlg.addEventListener('change', function () {
-                    dialogOptions.size = 'fullscreen';
+                settingsChanged = true;
-                } else {
-                    dialogOptions.size = 'small';
-                }
-
-                var dlg = dialogHelper.createDialog(dialogOptions);
-
-                dlg.classList.add('formDialog');
-
-                var html = '';
-
-                html += globalize.translateHtml(template, 'core');
-
-                dlg.innerHTML = html;
-
-                dlg.addEventListener('change', function () {
-                    settingsChanged = true;
-                });
-
-                dlg.addEventListener('close', function () {
-                    if (layoutManager.tv) {
-                        scrollHelper.centerFocus.off(dlg.querySelector('.formDialogContent'), false);
-                    }
-
-                    save(dlg);
-                    saveCategories(dlg, options);
-
-                    if (settingsChanged) {
-                        resolve();
-                    } else {
-                        reject();
-                    }
-                });
-
-                dlg.querySelector('.btnCancel').addEventListener('click', function () {
-                    dialogHelper.close(dlg);
-                });
-
-                if (layoutManager.tv) {
-                    scrollHelper.centerFocus.on(dlg.querySelector('.formDialogContent'), false);
-                }
-
-                load(dlg);
-                loadCategories(dlg, options);
-                dialogHelper.open(dlg);
             });
-        });
-    }
 
-    return {
+            dlg.addEventListener('close', function () {
-        show: showEditor
+                if (layoutManager.tv) {
-    };
+                    scrollHelper.centerFocus.off(dlg.querySelector('.formDialogContent'), false);
-});
+                }
+
+                save(dlg);
+                saveCategories(dlg, options);
+
+                if (settingsChanged) {
+                    resolve();
+                } else {
+                    reject();
+                }
+            });
+
+            dlg.querySelector('.btnCancel').addEventListener('click', function () {
+                dialogHelper.close(dlg);
+            });
+
+            if (layoutManager.tv) {
+                scrollHelper.centerFocus.on(dlg.querySelector('.formDialogContent'), false);
+            }
+
+            load(dlg);
+            loadCategories(dlg, options);
+            dialogHelper.open(dlg);
+        });
+    });
+}
+
+export default {
+    show: showEditor
+};

src/controllers/livetv/livetvguide.js

@@ -7,7 +7,7 @@ define(['tvguide'], function (tvguide) {
 
         self.renderTab = function () {
             if (!guideInstance) {
-                guideInstance = new tvguide({
+                guideInstance = new tvguide.default({
                     element: tabContent,
                     serverId: ApiClient.serverId()
                 });

src/plugins/chromecastPlayer/plugin.js

@@ -584,7 +584,7 @@ class ChromecastPlayer {
         this.isLocalPlayer = false;
         this.lastPlayerData = {};
 
-        new castSenderApiLoader.default().load().then(initializeChromecast.bind(this));
+        new castSenderApiLoader().load().then(initializeChromecast.bind(this));
     }
 
     tryPair(target) {

src/scripts/libraryMenu.js

@@ -850,7 +850,7 @@ import 'flexStyles';
     let requiresUserRefresh = true;
 
     function setTabs (type, selectedIndex, builder) {
-        import('mainTabsManager').then(({default: mainTabsManager}) => {
+        import('mainTabsManager').then((mainTabsManager) => {
             if (type) {
                 mainTabsManager.setTabs(viewManager.currentView(), selectedIndex, builder, function () {
                     return [];