diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index f2c01888e..59bd1d8e9 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -777,7 +777,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } } -@media all and (max-width: 800px), (max-height: 800px) { +@media all and (max-width: 800px) { .detailsHiddenOnMobile { display: none; diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js index ceb7ce489..42cb4b9ac 100644 --- a/dashboard-ui/scripts/livetvguide.js +++ b/dashboard-ui/scripts/livetvguide.js @@ -11,6 +11,16 @@ element: tabContent }); } + }; + self.onShow = function () { + if (guideInstance) { + guideInstance.resume(); + } + }; + self.onHide = function () { + if (guideInstance) { + guideInstance.pause(); + } }; }; }); \ No newline at end of file diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js index b387aa1de..20410cde8 100644 --- a/dashboard-ui/scripts/livetvsuggested.js +++ b/dashboard-ui/scripts/livetvsuggested.js @@ -266,6 +266,7 @@ var tabControllers = []; var renderedTabs = []; + var currentTabController; function getTabController(page, index, callback) { @@ -343,7 +344,12 @@ renderedTabs.push(index); } controller.renderTab(); + } else { + if (controller.onShow) { + controller.onShow(); + } } + currentTabController = controller; }); } @@ -356,11 +362,20 @@ }); viewTabs.addEventListener('tabchange', function (e) { + + var previousTabController = tabControllers[parseInt(e.detail.previousIndex)]; + if (previousTabController && previousTabController.onHide) { + previousTabController.onHide(); + } + loadTab(view, parseInt(e.detail.selectedTabIndex)); }); view.addEventListener('viewbeforehide', function (e) { + if (currentTabController && currentTabController.onHide) { + currentTabController.onHide(); + } document.body.classList.remove('autoScrollY'); }); diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index 525e4ec33..f0c439624 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -41,7 +41,7 @@ function getSavedQueryKey(context) { if (!context.savedQueryKey) { - context.savedQueryKey = libraryBrowser.getSavedQueryKey('movies'); + context.savedQueryKey = libraryBrowser.getSavedQueryKey('moviecollections'); } return context.savedQueryKey; } diff --git a/dashboard-ui/scripts/secondaryitems.js b/dashboard-ui/scripts/secondaryitems.js index 1f97b4469..ce844b892 100644 --- a/dashboard-ui/scripts/secondaryitems.js +++ b/dashboard-ui/scripts/secondaryitems.js @@ -110,7 +110,7 @@ } function onViewStyleChange(parentItem) { - + var query = getQuery(parentItem); var itemsContainer = view.querySelector('#items'); @@ -146,7 +146,13 @@ showLimit: false }); - view.querySelector('.listTopPaging').innerHTML = pagingHtml; + var i, length; + var elems; + + elems = view.querySelectorAll('.paging'); + for (i = 0, length = elems.length; i < length; i++) { + elems[i].innerHTML = pagingHtml; + } var itemsContainer = view.querySelector('#items'); @@ -189,12 +195,9 @@ html = cardBuilder.getCardsHtml(posterOptions); } - itemsContainer.innerHTML = html + pagingHtml; + itemsContainer.innerHTML = html; imageLoader.lazyChildren(itemsContainer); - var i, length; - var elems; - function onNextPageClick() { query.StartIndex += query.Limit; reloadItems(view); diff --git a/dashboard-ui/secondaryitems.html b/dashboard-ui/secondaryitems.html index a18fe76df..d5b7ae55b 100644 --- a/dashboard-ui/secondaryitems.html +++ b/dashboard-ui/secondaryitems.html @@ -2,10 +2,14 @@
-
+
+ +
+
+
\ No newline at end of file