Merge pull request #1745 from matjaz321/migrated-livetvchannels-to-es6-module

Migrated livetvchannels to es6 module

package.json

@@ -223,6 +223,7 @@
           "src/controllers/livetvstatus.js",
           "src/controllers/livetvguideprovider.js",
           "src/controllers/livetvsettings.js",
+          "src/controllers/livetv/livetvchannels.js",
           "src/controllers/shows/episodes.js",
           "src/controllers/shows/tvgenres.js",
           "src/controllers/shows/tvlatest.js",

src/controllers/livetv/livetvchannels.js

@@ -1,133 +1,134 @@
-define(['cardBuilder', 'imageLoader', 'libraryBrowser', 'loading', 'events', 'userSettings', 'emby-itemscontainer'], function (cardBuilder, imageLoader, libraryBrowser, loading, events, userSettings) {
+import cardBuilder from 'cardBuilder';
-    'use strict';
+import imageLoader from 'imageLoader';
+import libraryBrowser from 'libraryBrowser';
+import loading from 'loading';
+import events from 'events';
+import * as userSettings from 'userSettings';
+import 'emby-itemscontainer';
 
-    loading = loading.default || loading;
+export default function (view, params, tabContent) {
-    libraryBrowser = libraryBrowser.default || libraryBrowser;
+    function getPageData() {
+        if (!pageData) {
+            pageData = {
+                query: {
+                    StartIndex: 0,
+                    Fields: 'PrimaryImageAspectRatio'
+                }
+            };
+        }
 
-    return function (view, params, tabContent) {
+        if (userSettings.libraryPageSize() > 0) {
-        function getPageData() {
+            pageData.query['Limit'] = userSettings.libraryPageSize();
-            if (!pageData) {
+        }
-                pageData = {
+
-                    query: {
+        return pageData;
-                        StartIndex: 0,
+    }
-                        Fields: 'PrimaryImageAspectRatio'
+
-                    }
+    function getQuery() {
-                };
+        return getPageData().query;
+    }
+
+    function getChannelsHtml(channels) {
+        return cardBuilder.getCardsHtml({
+            items: channels,
+            shape: 'square',
+            showTitle: true,
+            lazy: true,
+            cardLayout: true,
+            showDetailsMenu: true,
+            showCurrentProgram: true,
+            showCurrentProgramTime: true
+        });
+    }
+
+    function renderChannels(context, result) {
+        function onNextPageClick() {
+            if (isLoading) {
+                return;
             }
 
             if (userSettings.libraryPageSize() > 0) {
-                pageData.query['Limit'] = userSettings.libraryPageSize();
+                query.StartIndex += query.Limit;
+            }
+            reloadItems(context);
+        }
+
+        function onPreviousPageClick() {
+            if (isLoading) {
+                return;
             }
 
-            return pageData;
+            if (userSettings.libraryPageSize() > 0) {
-        }
+                query.StartIndex = Math.max(0, query.StartIndex - query.Limit);
-
-        function getQuery() {
-            return getPageData().query;
-        }
-
-        function getChannelsHtml(channels) {
-            return cardBuilder.getCardsHtml({
-                items: channels,
-                shape: 'square',
-                showTitle: true,
-                lazy: true,
-                cardLayout: true,
-                showDetailsMenu: true,
-                showCurrentProgram: true,
-                showCurrentProgramTime: true
-            });
-        }
-
-        function renderChannels(context, result) {
-            function onNextPageClick() {
-                if (isLoading) {
-                    return;
-                }
-
-                if (userSettings.libraryPageSize() > 0) {
-                    query.StartIndex += query.Limit;
-                }
-                reloadItems(context);
-            }
-
-            function onPreviousPageClick() {
-                if (isLoading) {
-                    return;
-                }
-
-                if (userSettings.libraryPageSize() > 0) {
-                    query.StartIndex = Math.max(0, query.StartIndex - query.Limit);
-                }
-                reloadItems(context);
-            }
-
-            var query = getQuery();
-            context.querySelector('.paging').innerHTML = libraryBrowser.getQueryPagingHtml({
-                startIndex: query.StartIndex,
-                limit: query.Limit,
-                totalRecordCount: result.TotalRecordCount,
-                showLimit: false,
-                updatePageSizeSetting: false,
-                filterButton: false
-            });
-            var html = getChannelsHtml(result.Items);
-            var elem = context.querySelector('#items');
-            elem.innerHTML = html;
-            imageLoader.lazyChildren(elem);
-            var i;
-            var length;
-            var elems;
-
-            for (elems = context.querySelectorAll('.btnNextPage'), i = 0, length = elems.length; i < length; i++) {
-                elems[i].addEventListener('click', onNextPageClick);
-            }
-
-            for (elems = context.querySelectorAll('.btnPreviousPage'), i = 0, length = elems.length; i < length; i++) {
-                elems[i].addEventListener('click', onPreviousPageClick);
             }
+            reloadItems(context);
         }
 
-        function showFilterMenu(context) {
+        const query = getQuery();
-            require(['components/filterdialog/filterdialog'], function ({default: filterDialogFactory}) {
+        context.querySelector('.paging').innerHTML = libraryBrowser.getQueryPagingHtml({
-                var filterDialog = new filterDialogFactory({
+            startIndex: query.StartIndex,
-                    query: getQuery(),
+            limit: query.Limit,
-                    mode: 'livetvchannels',
+            totalRecordCount: result.TotalRecordCount,
-                    serverId: ApiClient.serverId()
+            showLimit: false,
-                });
+            updatePageSizeSetting: false,
-                events.on(filterDialog, 'filterchange', function () {
+            filterButton: false
-                    reloadItems(context);
-                });
-                filterDialog.show();
-            });
-        }
-
-        function reloadItems(context, save) {
-            loading.show();
-            isLoading = true;
-            var query = getQuery();
-            var apiClient = ApiClient;
-            query.UserId = apiClient.getCurrentUserId();
-            apiClient.getLiveTvChannels(query).then(function (result) {
-                renderChannels(context, result);
-                loading.hide();
-                isLoading = false;
-
-                require(['autoFocuser'], function (autoFocuser) {
-                    autoFocuser.autoFocus(view);
-                });
-            });
-        }
-
-        var pageData;
-        var self = this;
-        var isLoading = false;
-        tabContent.querySelector('.btnFilter').addEventListener('click', function () {
-            showFilterMenu(tabContent);
         });
+        const html = getChannelsHtml(result.Items);
+        const elem = context.querySelector('#items');
+        elem.innerHTML = html;
+        imageLoader.lazyChildren(elem);
+        let i;
+        let length;
+        let elems;
 
-        self.renderTab = function () {
+        for (elems = context.querySelectorAll('.btnNextPage'), i = 0, length = elems.length; i < length; i++) {
-            reloadItems(tabContent);
+            elems[i].addEventListener('click', onNextPageClick);
-        };
+        }
+
+        for (elems = context.querySelectorAll('.btnPreviousPage'), i = 0, length = elems.length; i < length; i++) {
+            elems[i].addEventListener('click', onPreviousPageClick);
+        }
+    }
+
+    function showFilterMenu(context) {
+        import(['components/filterdialog/filterdialog']).then(({default: FilterDialog}) => {
+            const filterDialog = new FilterDialog({
+                query: getQuery(),
+                mode: 'livetvchannels',
+                serverId: ApiClient.serverId()
+            });
+            events.on(filterDialog, 'filterchange', function () {
+                reloadItems(context);
+            });
+            filterDialog.show();
+        });
+    }
+
+    function reloadItems(context, save) {
+        loading.show();
+        isLoading = true;
+        const query = getQuery();
+        const apiClient = ApiClient;
+        query.UserId = apiClient.getCurrentUserId();
+        apiClient.getLiveTvChannels(query).then(function (result) {
+            renderChannels(context, result);
+            loading.hide();
+            isLoading = false;
+
+            import('autoFocuser').then(({default: autoFocuser}) => {
+                autoFocuser.autoFocus(view);
+            });
+        });
+    }
+
+    let pageData;
+    const self = this;
+    let isLoading = false;
+    tabContent.querySelector('.btnFilter').addEventListener('click', function () {
+        showFilterMenu(tabContent);
+    });
+
+    self.renderTab = function () {
+        reloadItems(tabContent);
     };
-});
+}