From 5f80642193ddd7207eec6def254cc8cc9ecba8cf Mon Sep 17 00:00:00 2001 From: dinki Date: Tue, 2 Jul 2019 14:17:36 -0500 Subject: [PATCH 1/4] Fix homesection programs button to go to correct page --- src/components/homesections/homesections.js | 3 ++- src/scripts/site.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js index 1b7e5533dd..ba7d827d93 100644 --- a/src/components/homesections/homesections.js +++ b/src/components/homesections/homesections.js @@ -684,7 +684,8 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la } html += '' + globalize.translate('Programs') + ''; html += ' Date: Tue, 2 Jul 2019 15:37:07 -0500 Subject: [PATCH 2/4] Fixes On Now section so items are shown --- src/components/homesections/homesections.js | 31 +++++++++------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js index ba7d827d93..956901b629 100644 --- a/src/components/homesections/homesections.js +++ b/src/components/homesections/homesections.js @@ -629,23 +629,18 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la function getOnNowItemsHtml(items) { var cardLayout = false; return cardBuilder.getCardsHtml({ - items: items, - preferThumb: 'auto', - inheritThumb: false, - shape: (enableScrollX() ? 'autooverflow' : 'auto'), - showParentTitleOrTitle: true, - showTitle: true, - centerText: true, - coverImage: true, - overlayText: false, - allowBottomPadding: !enableScrollX(), - showAirTime: true, - showChannelName: false, - showAirDateTime: false, - showAirEndTime: true, - defaultShape: getThumbShape(), - lines: 3, - overlayPlayButton: true + items: items, + preferThumb: true, + shape: getThumbShape(), + overlayText: false, + showTitle: true, + showParentTitle: true, + lazy: true, + overlayPlayButton: true, + context: 'home', + centerText: !cardLayout, + allowBottomPadding: !enableScrollX(), + cardLayout: cardLayout }); } @@ -655,7 +650,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la } var userId = user.Id; - apiClient.getLiveTvRecommendedPrograms({ + return apiClient.getLiveTvRecommendedPrograms({ userId: apiClient.getCurrentUserId(), IsAiring: true, limit: 1, From bae555928f727f7a8b016a329f7b30ac98429ffb Mon Sep 17 00:00:00 2001 From: dinki Date: Tue, 2 Jul 2019 15:43:05 -0500 Subject: [PATCH 3/4] clean up --- src/components/homesections/homesections.js | 29 ++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js index 956901b629..49b1062cc5 100644 --- a/src/components/homesections/homesections.js +++ b/src/components/homesections/homesections.js @@ -629,18 +629,23 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la function getOnNowItemsHtml(items) { var cardLayout = false; return cardBuilder.getCardsHtml({ - items: items, - preferThumb: true, - shape: getThumbShape(), - overlayText: false, - showTitle: true, - showParentTitle: true, - lazy: true, - overlayPlayButton: true, - context: 'home', - centerText: !cardLayout, - allowBottomPadding: !enableScrollX(), - cardLayout: cardLayout + items: items, + preferThumb: 'auto', + inheritThumb: false, + shape: (enableScrollX() ? 'autooverflow' : 'auto'), + showParentTitleOrTitle: true, + showTitle: true, + centerText: true, + coverImage: true, + overlayText: false, + allowBottomPadding: !enableScrollX(), + showAirTime: true, + showChannelName: false, + showAirDateTime: false, + showAirEndTime: true, + defaultShape: getThumbShape(), + lines: 3, + overlayPlayButton: true }); } From 8147f7847d8339d863bac2f4b4fce8c2c074a181 Mon Sep 17 00:00:00 2001 From: dinki Date: Wed, 3 Jul 2019 09:37:05 -0500 Subject: [PATCH 4/4] Remove On Now PR fix --- src/components/homesections/homesections.js | 2 +- src/scripts/site.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js index 49b1062cc5..ba7d827d93 100644 --- a/src/components/homesections/homesections.js +++ b/src/components/homesections/homesections.js @@ -655,7 +655,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la } var userId = user.Id; - return apiClient.getLiveTvRecommendedPrograms({ + apiClient.getLiveTvRecommendedPrograms({ userId: apiClient.getCurrentUserId(), IsAiring: true, limit: 1, diff --git a/src/scripts/site.js b/src/scripts/site.js index c281f9f180..a9fc13d9ed 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -1014,8 +1014,7 @@ var AppInfo = {}; if ("livetv" === item) { if ("programs" === options.section) { return "livetv.html?tab=0&serverId=" + options.serverId; - } - + } if ("guide" === options.section) { return "livetv.html?tab=1&serverId=" + options.serverId; }