Merge pull request #1725 from matjaz321/livetvsuggested-to-es6-module-migration

Migrated livetvsuggested.js to es6 module

package.json

@@ -259,6 +259,7 @@
           "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",

src/controllers/livetv/livetvsuggested.js

@@ -1,392 +1,397 @@
-define(['layoutManager', 'userSettings', 'inputManager', 'loading', 'globalize', 'libraryBrowser', 'mainTabsManager', 'cardBuilder', 'apphost', 'imageLoader', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (layoutManager, userSettings, inputManager, loading, globalize, libraryBrowser, mainTabsManager, cardBuilder, appHost, imageLoader) {
+import layoutManager from 'layoutManager';
-    'use strict';
+import * as userSettings from 'userSettings';
+import inputManager from 'inputManager';
+import loading from 'loading';
+import globalize from 'globalize';
+import * as mainTabsManager from 'mainTabsManager';
+import cardBuilder from 'cardBuilder';
+import imageLoader from 'imageLoader';
+import 'scrollStyles';
+import 'emby-itemscontainer';
+import 'emby-tabs';
+import 'emby-button';
 
-    loading = loading.default || loading;
+function enableScrollX() {
-    layoutManager = layoutManager.default || layoutManager;
+    return !layoutManager.desktop;
+}
 
-    function enableScrollX() {
+function getBackdropShape() {
-        return !layoutManager.desktop;
+    if (enableScrollX()) {
+        return 'overflowBackdrop';
+    }
+    return 'backdrop';
+}
+
+function getPortraitShape() {
+    if (enableScrollX()) {
+        return 'overflowPortrait';
+    }
+    return 'portrait';
+}
+
+function getLimit() {
+    if (enableScrollX()) {
+        return 12;
     }
 
-    function getBackdropShape() {
+    return 9;
-        if (enableScrollX()) {
+}
-            return 'overflowBackdrop';
+
-        }
+function loadRecommendedPrograms(page) {
-        return 'backdrop';
+    loading.show();
+    let limit = getLimit();
+
+    if (enableScrollX()) {
+        limit *= 2;
     }
 
-    function getPortraitShape() {
+    ApiClient.getLiveTvRecommendedPrograms({
-        if (enableScrollX()) {
+        userId: Dashboard.getCurrentUserId(),
-            return 'overflowPortrait';
+        IsAiring: true,
-        }
+        limit: limit,
-        return 'portrait';
+        ImageTypeLimit: 1,
-    }
+        EnableImageTypes: 'Primary,Thumb,Backdrop',
+        EnableTotalRecordCount: false,
+        Fields: 'ChannelInfo,PrimaryImageAspectRatio'
+    }).then(function (result) {
+        renderItems(page, result.Items, 'activeProgramItems', 'play', {
+            showAirDateTime: false,
+            showAirEndTime: true
+        });
+        loading.hide();
 
-    function getLimit() {
+        import('autoFocuser').then(({default: autoFocuser}) => {
-        if (enableScrollX()) {
+            autoFocuser.autoFocus(page);
-            return 12;
+        });
-        }
+    });
+}
 
-        return 9;
+function reload(page, enableFullRender) {
-    }
+    if (enableFullRender) {
-
+        loadRecommendedPrograms(page);
-    function loadRecommendedPrograms(page) {
+        ApiClient.getLiveTvPrograms({
-        loading.show();
-        var limit = getLimit();
-
-        if (enableScrollX()) {
-            limit *= 2;
-        }
-
-        ApiClient.getLiveTvRecommendedPrograms({
             userId: Dashboard.getCurrentUserId(),
-            IsAiring: true,
+            HasAired: false,
-            limit: limit,
+            limit: getLimit(),
-            ImageTypeLimit: 1,
+            IsMovie: false,
-            EnableImageTypes: 'Primary,Thumb,Backdrop',
+            IsSports: false,
+            IsKids: false,
+            IsNews: false,
+            IsSeries: true,
             EnableTotalRecordCount: false,
-            Fields: 'ChannelInfo,PrimaryImageAspectRatio'
+            Fields: 'ChannelInfo,PrimaryImageAspectRatio',
+            EnableImageTypes: 'Primary,Thumb'
         }).then(function (result) {
-            renderItems(page, result.Items, 'activeProgramItems', 'play', {
+            renderItems(page, result.Items, 'upcomingEpisodeItems');
-                showAirDateTime: false,
+        });
-                showAirEndTime: true
+        ApiClient.getLiveTvPrograms({
+            userId: Dashboard.getCurrentUserId(),
+            HasAired: false,
+            limit: getLimit(),
+            IsMovie: true,
+            EnableTotalRecordCount: false,
+            Fields: 'ChannelInfo',
+            EnableImageTypes: 'Primary,Thumb'
+        }).then(function (result) {
+            renderItems(page, result.Items, 'upcomingTvMovieItems', null, {
+                shape: getPortraitShape(),
+                preferThumb: null,
+                showParentTitle: false
             });
-            loading.hide();
+        });
-
+        ApiClient.getLiveTvPrograms({
-            require(['autoFocuser'], function (autoFocuser) {
+            userId: Dashboard.getCurrentUserId(),
-                autoFocuser.autoFocus(page);
+            HasAired: false,
+            limit: getLimit(),
+            IsSports: true,
+            EnableTotalRecordCount: false,
+            Fields: 'ChannelInfo,PrimaryImageAspectRatio',
+            EnableImageTypes: 'Primary,Thumb'
+        }).then(function (result) {
+            renderItems(page, result.Items, 'upcomingSportsItems');
+        });
+        ApiClient.getLiveTvPrograms({
+            userId: Dashboard.getCurrentUserId(),
+            HasAired: false,
+            limit: getLimit(),
+            IsKids: true,
+            EnableTotalRecordCount: false,
+            Fields: 'ChannelInfo,PrimaryImageAspectRatio',
+            EnableImageTypes: 'Primary,Thumb'
+        }).then(function (result) {
+            renderItems(page, result.Items, 'upcomingKidsItems');
+        });
+        ApiClient.getLiveTvPrograms({
+            userId: Dashboard.getCurrentUserId(),
+            HasAired: false,
+            limit: getLimit(),
+            IsNews: true,
+            EnableTotalRecordCount: false,
+            Fields: 'ChannelInfo,PrimaryImageAspectRatio',
+            EnableImageTypes: 'Primary,Thumb'
+        }).then(function (result) {
+            renderItems(page, result.Items, 'upcomingNewsItems', null, {
+                showParentTitleOrTitle: true,
+                showTitle: false,
+                showParentTitle: false
             });
         });
     }
+}
 
-    function reload(page, enableFullRender) {
+function renderItems(page, items, sectionClass, overlayButton, cardOptions) {
-        if (enableFullRender) {
+    const html = cardBuilder.getCardsHtml(Object.assign({
-            loadRecommendedPrograms(page);
+        items: items,
-            ApiClient.getLiveTvPrograms({
+        preferThumb: 'auto',
-                userId: Dashboard.getCurrentUserId(),
+        inheritThumb: false,
-                HasAired: false,
+        shape: enableScrollX() ? 'autooverflow' : 'auto',
-                limit: getLimit(),
+        defaultShape: getBackdropShape(),
-                IsMovie: false,
+        showParentTitle: true,
-                IsSports: false,
+        showTitle: true,
-                IsKids: false,
+        centerText: true,
-                IsNews: false,
+        coverImage: true,
-                IsSeries: true,
+        overlayText: false,
-                EnableTotalRecordCount: false,
+        lazy: true,
-                Fields: 'ChannelInfo,PrimaryImageAspectRatio',
+        overlayPlayButton: overlayButton === 'play',
-                EnableImageTypes: 'Primary,Thumb'
+        overlayMoreButton: overlayButton === 'more',
-            }).then(function (result) {
+        overlayInfoButton: overlayButton === 'info',
-                renderItems(page, result.Items, 'upcomingEpisodeItems');
+        allowBottomPadding: !enableScrollX(),
-            });
+        showAirTime: true,
-            ApiClient.getLiveTvPrograms({
+        showAirDateTime: true
-                userId: Dashboard.getCurrentUserId(),
+    }, cardOptions || {}));
-                HasAired: false,
+    const elem = page.querySelector('.' + sectionClass);
-                limit: getLimit(),
+    elem.innerHTML = html;
-                IsMovie: true,
+    imageLoader.lazyChildren(elem);
-                EnableTotalRecordCount: false,
+}
-                Fields: 'ChannelInfo',
+
-                EnableImageTypes: 'Primary,Thumb'
+function getTabs() {
-            }).then(function (result) {
+    return [{
-                renderItems(page, result.Items, 'upcomingTvMovieItems', null, {
+        name: globalize.translate('Programs')
-                    shape: getPortraitShape(),
+    }, {
-                    preferThumb: null,
+        name: globalize.translate('TabGuide')
-                    showParentTitle: false
+    }, {
-                });
+        name: globalize.translate('TabChannels')
-            });
+    }, {
-            ApiClient.getLiveTvPrograms({
+        name: globalize.translate('TabRecordings')
-                userId: Dashboard.getCurrentUserId(),
+    }, {
-                HasAired: false,
+        name: globalize.translate('HeaderSchedule')
-                limit: getLimit(),
+    }, {
-                IsSports: true,
+        name: globalize.translate('TabSeries')
-                EnableTotalRecordCount: false,
+    }];
-                Fields: 'ChannelInfo,PrimaryImageAspectRatio',
+}
-                EnableImageTypes: 'Primary,Thumb'
+
-            }).then(function (result) {
+function setScrollClasses(elem, scrollX) {
-                renderItems(page, result.Items, 'upcomingSportsItems');
+    if (scrollX) {
-            });
+        elem.classList.add('hiddenScrollX');
-            ApiClient.getLiveTvPrograms({
+
-                userId: Dashboard.getCurrentUserId(),
+        if (layoutManager.tv) {
-                HasAired: false,
+            elem.classList.add('smoothScrollX');
-                limit: getLimit(),
-                IsKids: true,
-                EnableTotalRecordCount: false,
-                Fields: 'ChannelInfo,PrimaryImageAspectRatio',
-                EnableImageTypes: 'Primary,Thumb'
-            }).then(function (result) {
-                renderItems(page, result.Items, 'upcomingKidsItems');
-            });
-            ApiClient.getLiveTvPrograms({
-                userId: Dashboard.getCurrentUserId(),
-                HasAired: false,
-                limit: getLimit(),
-                IsNews: true,
-                EnableTotalRecordCount: false,
-                Fields: 'ChannelInfo,PrimaryImageAspectRatio',
-                EnableImageTypes: 'Primary,Thumb'
-            }).then(function (result) {
-                renderItems(page, result.Items, 'upcomingNewsItems', null, {
-                    showParentTitleOrTitle: true,
-                    showTitle: false,
-                    showParentTitle: false
-                });
-            });
         }
+
+        elem.classList.add('scrollX');
+        elem.classList.remove('vertical-wrap');
+    } else {
+        elem.classList.remove('hiddenScrollX');
+        elem.classList.remove('smoothScrollX');
+        elem.classList.remove('scrollX');
+        elem.classList.add('vertical-wrap');
+    }
+}
+
+function getDefaultTabIndex(folderId) {
+    if (userSettings.get('landing-' + folderId) === 'guide') {
+        return 1;
     }
 
-    function renderItems(page, items, sectionClass, overlayButton, cardOptions) {
+    return 0;
-        var html = cardBuilder.getCardsHtml(Object.assign({
+}
-            items: items,
+
-            preferThumb: 'auto',
+export default function (view, params) {
-            inheritThumb: false,
+    function enableFullRender() {
-            shape: enableScrollX() ? 'autooverflow' : 'auto',
+        return new Date().getTime() - lastFullRender > 3e5;
-            defaultShape: getBackdropShape(),
-            showParentTitle: true,
-            showTitle: true,
-            centerText: true,
-            coverImage: true,
-            overlayText: false,
-            lazy: true,
-            overlayPlayButton: overlayButton === 'play',
-            overlayMoreButton: overlayButton === 'more',
-            overlayInfoButton: overlayButton === 'info',
-            allowBottomPadding: !enableScrollX(),
-            showAirTime: true,
-            showAirDateTime: true
-        }, cardOptions || {}));
-        var elem = page.querySelector('.' + sectionClass);
-        elem.innerHTML = html;
-        imageLoader.lazyChildren(elem);
     }
 
-    function getTabs() {
+    function onBeforeTabChange(evt) {
-        return [{
+        preLoadTab(view, parseInt(evt.detail.selectedTabIndex));
-            name: globalize.translate('Programs')
-        }, {
-            name: globalize.translate('TabGuide')
-        }, {
-            name: globalize.translate('TabChannels')
-        }, {
-            name: globalize.translate('TabRecordings')
-        }, {
-            name: globalize.translate('HeaderSchedule')
-        }, {
-            name: globalize.translate('TabSeries')
-        }];
     }
 
-    function setScrollClasses(elem, scrollX) {
+    function onTabChange(evt) {
-        if (scrollX) {
+        const previousTabController = tabControllers[parseInt(evt.detail.previousIndex)];
-            elem.classList.add('hiddenScrollX');
 
-            if (layoutManager.tv) {
+        if (previousTabController && previousTabController.onHide) {
-                elem.classList.add('smoothScrollX');
+            previousTabController.onHide();
+        }
+
+        loadTab(view, parseInt(evt.detail.selectedTabIndex));
+    }
+
+    function getTabContainers() {
+        return view.querySelectorAll('.pageTabContent');
+    }
+
+    function initTabs() {
+        mainTabsManager.setTabs(view, currentTabIndex, getTabs, getTabContainers, onBeforeTabChange, onTabChange);
+    }
+
+    function getTabController(page, index, callback) {
+        let depends;
+
+        // TODO int is a little hard to read
+        switch (index) {
+            case 0:
+                depends = 'controllers/livetv/livetvsuggested';
+                break;
+
+            case 1:
+                depends = 'controllers/livetv/livetvguide';
+                break;
+
+            case 2:
+                depends = 'controllers/livetv/livetvchannels';
+                break;
+
+            case 3:
+                depends = 'controllers/livetv/livetvrecordings';
+                break;
+
+            case 4:
+                depends = 'controllers/livetv/livetvschedule';
+                break;
+
+            case 5:
+                depends = 'controllers/livetv/livetvseriestimers';
+                break;
+        }
+
+        import(depends).then(({default: controllerFactory}) => {
+            let tabContent;
+
+            if (index === 0) {
+                tabContent = view.querySelector(`.pageTabContent[data-index="${index}"]`);
+                self.tabContent = tabContent;
             }
 
-            elem.classList.add('scrollX');
+            let controller = tabControllers[index];
-            elem.classList.remove('vertical-wrap');
-        } else {
-            elem.classList.remove('hiddenScrollX');
-            elem.classList.remove('smoothScrollX');
-            elem.classList.remove('scrollX');
-            elem.classList.add('vertical-wrap');
-        }
-    }
 
-    function getDefaultTabIndex(folderId) {
+            if (!controller) {
-        if (userSettings.get('landing-' + folderId) === 'guide') {
+                tabContent = view.querySelector(`.pageTabContent[data-index="${index}"]`);
-            return 1;
-        }
 
-        return 0;
+                if (index === 0) {
-    }
+                    controller = self;
-
+                } else if (index === 6) {
-    return function (view, params) {
+                    controller = new controllerFactory(view, tabContent, {
-        function enableFullRender() {
+                        collectionType: 'livetv'
-            return new Date().getTime() - lastFullRender > 3e5;
+                    });
-        }
+                } else {
-
+                    controller = new controllerFactory(view, params, tabContent);
-        function onBeforeTabChange(evt) {
-            preLoadTab(view, parseInt(evt.detail.selectedTabIndex));
-        }
-
-        function onTabChange(evt) {
-            var previousTabController = tabControllers[parseInt(evt.detail.previousIndex)];
-
-            if (previousTabController && previousTabController.onHide) {
-                previousTabController.onHide();
-            }
-
-            loadTab(view, parseInt(evt.detail.selectedTabIndex));
-        }
-
-        function getTabContainers() {
-            return view.querySelectorAll('.pageTabContent');
-        }
-
-        function initTabs() {
-            mainTabsManager.setTabs(view, currentTabIndex, getTabs, getTabContainers, onBeforeTabChange, onTabChange);
-        }
-
-        function getTabController(page, index, callback) {
-            var depends = [];
-
-            // TODO int is a little hard to read
-            switch (index) {
-                case 0:
-                    break;
-
-                case 1:
-                    depends.push('controllers/livetv/livetvguide');
-                    break;
-
-                case 2:
-                    depends.push('controllers/livetv/livetvchannels');
-                    break;
-
-                case 3:
-                    depends.push('controllers/livetv/livetvrecordings');
-                    break;
-
-                case 4:
-                    depends.push('controllers/livetv/livetvschedule');
-                    break;
-
-                case 5:
-                    depends.push('controllers/livetv/livetvseriestimers');
-                    break;
-            }
-
-            require(depends, function (controllerFactory) {
-                controllerFactory = controllerFactory.default || controllerFactory;
-
-                var tabContent;
-
-                if (index == 0) {
-                    tabContent = view.querySelector(".pageTabContent[data-index='" + index + "']");
-                    self.tabContent = tabContent;
                 }
 
-                var controller = tabControllers[index];
+                tabControllers[index] = controller;
 
-                if (!controller) {
+                if (controller.initTab) {
-                    tabContent = view.querySelector(".pageTabContent[data-index='" + index + "']");
+                    controller.initTab();
+                }
+            }
 
-                    if (index === 0) {
+            callback(controller);
-                        controller = self;
+        });
-                    } else if (index === 6) {
+    }
-                        controller = new controllerFactory(view, tabContent, {
-                            collectionType: 'livetv'
-                        });
-                    } else {
-                        controller = new controllerFactory(view, params, tabContent);
-                    }
 
-                    tabControllers[index] = controller;
+    function preLoadTab(page, index) {
+        getTabController(page, index, function (controller) {
+            if (renderedTabs.indexOf(index) === -1 && controller.preRender) {
+                controller.preRender();
+            }
+        });
+    }
 
-                    if (controller.initTab) {
+    function loadTab(page, index) {
-                        controller.initTab();
+        currentTabIndex = index;
-                    }
+        getTabController(page, index, function (controller) {
+            initialTabIndex = null;
+
+            if (renderedTabs.indexOf(index) === -1) {
+                if (index === 1) {
+                    renderedTabs.push(index);
                 }
 
-                callback(controller);
+                controller.renderTab();
-            });
+            } else if (controller.onShow) {
+                controller.onShow();
+            }
+
+            currentTabController = controller;
+        });
+    }
+
+    function onInputCommand(evt) {
+        if (evt.detail.command === 'search') {
+            evt.preventDefault();
+            Dashboard.navigate('search.html?collectionType=livetv');
         }
+    }
 
-        function preLoadTab(page, index) {
+    let isViewRestored;
-            getTabController(page, index, function (controller) {
+    const self = this;
-                if (renderedTabs.indexOf(index) === -1 && controller.preRender) {
+    let currentTabIndex = parseInt(params.tab || getDefaultTabIndex('livetv'));
-                    controller.preRender();
+    let initialTabIndex = currentTabIndex;
-                }
+    let lastFullRender = 0;
-            });
+    [].forEach.call(view.querySelectorAll('.sectionTitleTextButton-programs'), function (link) {
+        const href = link.href;
+
+        if (href) {
+            link.href = href + '&serverId=' + ApiClient.serverId();
         }
+    });
 
-        function loadTab(page, index) {
+    self.initTab = function () {
-            currentTabIndex = index;
+        const tabContent = view.querySelector('.pageTabContent[data-index="0"]');
-            getTabController(page, index, function (controller) {
+        const containers = tabContent.querySelectorAll('.itemsContainer');
-                initialTabIndex = null;
 
-                if (renderedTabs.indexOf(index) == -1) {
+        for (let i = 0, length = containers.length; i < length; i++) {
-                    if (index === 1) {
+            setScrollClasses(containers[i], enableScrollX());
-                        renderedTabs.push(index);
-                    }
-
-                    controller.renderTab();
-                } else if (controller.onShow) {
-                    controller.onShow();
-                }
-
-                currentTabController = controller;
-            });
         }
-
-        function onInputCommand(evt) {
-            if (evt.detail.command === 'search') {
-                evt.preventDefault();
-                Dashboard.navigate('search.html?collectionType=livetv');
-            }
-        }
-
-        var isViewRestored;
-        var self = this;
-        var currentTabIndex = parseInt(params.tab || getDefaultTabIndex('livetv'));
-        var initialTabIndex = currentTabIndex;
-        var lastFullRender = 0;
-        [].forEach.call(view.querySelectorAll('.sectionTitleTextButton-programs'), function (link) {
-            var href = link.href;
-
-            if (href) {
-                link.href = href + '&serverId=' + ApiClient.serverId();
-            }
-        });
-
-        self.initTab = function () {
-            var tabContent = view.querySelector(".pageTabContent[data-index='0']");
-            var containers = tabContent.querySelectorAll('.itemsContainer');
-
-            for (var i = 0, length = containers.length; i < length; i++) {
-                setScrollClasses(containers[i], enableScrollX());
-            }
-        };
-
-        self.renderTab = function () {
-            var tabContent = view.querySelector(".pageTabContent[data-index='0']");
-
-            if (enableFullRender()) {
-                reload(tabContent, true);
-                lastFullRender = new Date().getTime();
-            } else {
-                reload(tabContent);
-            }
-        };
-
-        var currentTabController;
-        var tabControllers = [];
-        var renderedTabs = [];
-        view.addEventListener('viewbeforeshow', function (evt) {
-            isViewRestored = evt.detail.isRestored;
-            initTabs();
-        });
-        view.addEventListener('viewshow', function (evt) {
-            isViewRestored = evt.detail.isRestored;
-
-            if (!isViewRestored) {
-                mainTabsManager.selectedTabIndex(initialTabIndex);
-            }
-
-            inputManager.on(window, onInputCommand);
-        });
-        view.addEventListener('viewbeforehide', function (e) {
-            if (currentTabController && currentTabController.onHide) {
-                currentTabController.onHide();
-            }
-
-            inputManager.off(window, onInputCommand);
-        });
-        view.addEventListener('viewdestroy', function (evt) {
-            tabControllers.forEach(function (tabController) {
-                if (tabController.destroy) {
-                    tabController.destroy();
-                }
-            });
-        });
     };
-});
+
+    self.renderTab = function () {
+        const tabContent = view.querySelector('.pageTabContent[data-index="0"]');
+
+        if (enableFullRender()) {
+            reload(tabContent, true);
+            lastFullRender = new Date().getTime();
+        } else {
+            reload(tabContent);
+        }
+    };
+
+    let currentTabController;
+    const tabControllers = [];
+    const renderedTabs = [];
+    view.addEventListener('viewbeforeshow', function (evt) {
+        isViewRestored = evt.detail.isRestored;
+        initTabs();
+    });
+    view.addEventListener('viewshow', function (evt) {
+        isViewRestored = evt.detail.isRestored;
+
+        if (!isViewRestored) {
+            mainTabsManager.selectedTabIndex(initialTabIndex);
+        }
+
+        inputManager.on(window, onInputCommand);
+    });
+    view.addEventListener('viewbeforehide', function () {
+        if (currentTabController && currentTabController.onHide) {
+            currentTabController.onHide();
+        }
+
+        inputManager.off(window, onInputCommand);
+    });
+    view.addEventListener('viewdestroy', function () {
+        tabControllers.forEach(function (tabController) {
+            if (tabController.destroy) {
+                tabController.destroy();
+            }
+        });
+    });
+}