Merge pull request #3149 from grafixeyehero/Fix-LiveTV-DefaultTab

src/controllers/livetv.html

@@ -1,7 +1,5 @@
 <div id="liveTvSuggestedPage" data-dom-cache="true" data-role="page" class="page libraryPage liveTvPage pageWithAbsoluteTabs withTabs" data-title="${LiveTV}" data-backdroptype="series,movie">
-
     <div class="liveTvContainer">
-
         <div class="pageTabContent" id="suggestionsTab" data-index="0">
             <div id="activePrograms" class="verticalSection">
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
@@ -90,8 +88,5 @@
         <div class="pageTabContent padded-top" id="seriesTab" data-index="5">
             <div is="emby-itemscontainer" class="vertical-wrap itemsContainer centered padded-left padded-right" id="items"></div>
         </div>
-        <div class="pageTabContent" data-index="6">
-        </div>
     </div>
-
 </div>

src/controllers/livetv/livetvsuggested.js

@@ -200,11 +200,20 @@ function setScrollClasses(elem, scrollX) {
 }
 
 function getDefaultTabIndex(folderId) {
-    if (userSettings.get('landing-' + folderId) === 'guide') {
-        return 1;
+    switch (userSettings.get('landing-' + folderId)) {
+        case 'guide':
+            return 1;
+        case 'channels':
+            return 2;
+        case 'recordings':
+            return 3;
+        case 'schedule':
+            return 4;
+        case 'series':
+            return 5;
+        default:
+            return 0;
     }
-
-    return 0;
 }
 
 export default function (view, params) {
@@ -279,10 +288,6 @@ export default function (view, params) {
 
                 if (index === 0) {
                     controller = self;
-                } else if (index === 6) {
-                    controller = new controllerFactory(view, tabContent, {
-                        collectionType: 'livetv'
-                    });
                 } else {
                     controller = new controllerFactory(view, params, tabContent);
                 }