Migration of livetvguide and livetvcomponents to ES6 moduoles

package.json

@@ -209,6 +209,7 @@
           "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/livetvstatus.js",
           "src/controllers/livetvsettings.js",
@@ -270,6 +271,7 @@
           "src/scripts/inputManager.js",
           "src/scripts/keyboardNavigation.js",
           "src/scripts/libraryBrowser.js",
+          "src/scripts/livetvcomponents.js",
           "src/scripts/mouseManager.js",
           "src/scripts/multiDownload.js",
           "src/scripts/playlists.js",

src/controllers/livetv/livetvguide.js

@@ -1,9 +1,8 @@
-define(['tvguide'], function (tvguide) {
+import tvguide from 'tvguide';
-    'use strict';
 
-    return function (view, params, tabContent) {
+export default function (view, params, tabContent) {
-        var guideInstance;
+    let guideInstance;
-        var self = this;
+    const self = this;
 
     self.renderTab = function () {
         if (!guideInstance) {
@@ -26,4 +25,3 @@ define(['tvguide'], function (tvguide) {
         }
     };
 };
-});

src/scripts/livetvcomponents.js

@@ -1,5 +1,6 @@
-define(['layoutManager', 'datetime', 'cardBuilder', 'apphost'], function (layoutManager, datetime, cardBuilder, appHost) {
+import layoutManager from 'layoutManager';
-    'use strict';
+import datetime from 'datetime';
+import cardBuilder from 'cardBuilder';
 
 function enableScrollX() {
     return !layoutManager.desktop;
@@ -11,23 +12,21 @@ define(['layoutManager', 'datetime', 'cardBuilder', 'apphost'], function (layout
 
 function getTimersHtml(timers, options) {
     options = options || {};
-        var i;
+    const items = timers.map(function (t) {
-        var length;
-        var items = timers.map(function (t) {
         t.Type = 'Timer';
         return t;
     });
-        var groups = [];
+    const groups = [];
-        var currentGroupName = '';
+    let currentGroupName = '';
-        var currentGroup = [];
+    let currentGroup = [];
 
-        for (i = 0, length = items.length; i < length; i++) {
+    for (let i = 0, length = items.length; i < length; i++) {
-            var item = items[i];
+        const item = items[i];
-            var dateText = '';
+        let dateText = '';
 
         if (options.indexByDate !== false && item.StartDate) {
             try {
-                    var premiereDate = datetime.parseISO8601Date(item.StartDate, true);
+                const premiereDate = datetime.parseISO8601Date(item.StartDate, true);
                 dateText = datetime.toLocaleDateString(premiereDate, {
                     weekday: 'long',
                     month: 'short',
@@ -52,35 +51,28 @@ define(['layoutManager', 'datetime', 'cardBuilder', 'apphost'], function (layout
             currentGroup.push(item);
         }
     }
-
     if (currentGroup.length) {
         groups.push({
             name: currentGroupName,
             items: currentGroup
         });
     }
-
+    let html = '';
-        var html = '';
+    for (let i = 0, length = groups.length; i < length; i++) {
-
+        const group = groups[i];
-        for (i = 0, length = groups.length; i < length; i++) {
-            var group = groups[i];
-
         if (group.name) {
             html += '<div class="verticalSection">';
             html += '<h2 class="sectionTitle sectionTitle-cards padded-left">' + group.name + '</h2>';
         }
         if (enableScrollX()) {
-                var scrollXClass = 'scrollX hiddenScrollX';
+            let scrollXClass = 'scrollX hiddenScrollX';
-
             if (layoutManager.tv) {
                 scrollXClass += ' smoothScrollX';
             }
-
             html += '<div is="emby-itemscontainer" class="itemsContainer ' + scrollXClass + ' padded-left padded-right">';
         } else {
             html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right">';
         }
-
         html += cardBuilder.getCardsHtml({
             items: group.items,
             shape: getBackdropShape(),
@@ -100,16 +92,13 @@ define(['layoutManager', 'datetime', 'cardBuilder', 'apphost'], function (layout
             showChannelLogo: true
         });
         html += '</div>';
-
         if (group.name) {
             html += '</div>';
         }
     }
-
     return Promise.resolve(html);
 }
 
 window.LiveTvHelpers = {
     getTimersHtml: getTimersHtml
 };
-});