Merge pull request #1749 from Camc314/migrate-to-ES6-55

Migration of livetvguide and livetvcomponents to ES6 modules

package.json

@@ -248,6 +248,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/livetvguideprovider.js",
@@ -320,6 +321,7 @@
           "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/controllers/livetv/livetvguide.js

@@ -1,13 +1,12 @@
-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) {
-                guideInstance = new tvguide.default({
+            guideInstance = new tvguide({
                 element: tabContent,
                 serverId: ApiClient.serverId()
             });
@@ -25,5 +24,4 @@ define(['tvguide'], function (tvguide) {
             guideInstance.pause();
         }
     };
-    };
+}
-});

src/controllers/livetv/livetvsuggested.js

@@ -256,6 +256,8 @@ define(['layoutManager', 'userSettings', 'inputManager', 'loading', 'globalize',
             }
 
             require(depends, function (controllerFactory) {
+                controllerFactory = controllerFactory.default || controllerFactory;
+
                 var tabContent;
 
                 if (index == 0) {

src/scripts/livetvcomponents.js

@@ -1,7 +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';
-    layoutManager = layoutManager.default || layoutManager;
 
 function enableScrollX() {
     return !layoutManager.desktop;
@@ -13,23 +12,22 @@ define(['layoutManager', 'datetime', 'cardBuilder', 'apphost'], function (layout
 
 function getTimersHtml(timers, options) {
     options = options || {};
-        var i;
+
-        var length;
+    const items = timers.map(function (t) {
-        var items = timers.map(function (t) {
         t.Type = 'Timer';
         return t;
     });
-        var groups = [];
-        var currentGroupName = '';
-        var currentGroup = [];
 
-        for (i = 0, length = items.length; i < length; i++) {
+    const groups = [];
-            var item = items[i];
+    let currentGroupName = '';
-            var dateText = '';
+    let currentGroup = [];
+
+    for (const item of items) {
+        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',
@@ -61,23 +59,18 @@ define(['layoutManager', 'datetime', 'cardBuilder', 'apphost'], function (layout
             items: currentGroup
         });
     }
-
+    let html = '';
-        var html = '';
+    for (const group of groups) {
-
-        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';
 
+        if (enableScrollX()) {
+            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">';
@@ -101,17 +94,16 @@ define(['layoutManager', 'datetime', 'cardBuilder', 'apphost'], function (layout
             overlayText: false,
             showChannelLogo: true
         });
+
         html += '</div>';
 
         if (group.name) {
             html += '</div>';
         }
     }
-
     return Promise.resolve(html);
 }
 
 window.LiveTvHelpers = {
     getTimersHtml: getTimersHtml
 };
-});