diff --git a/src/controllers/livetv.html b/src/controllers/livetv.html index b1f60f4ef..2a484c6db 100644 --- a/src/controllers/livetv.html +++ b/src/controllers/livetv.html @@ -64,6 +64,9 @@
+
+
+
diff --git a/src/controllers/livetv/livetvchannels.js b/src/controllers/livetv/livetvchannels.js index cd7b50dd4..9a82a3d53 100644 --- a/src/controllers/livetv/livetvchannels.js +++ b/src/controllers/livetv/livetvchannels.js @@ -50,7 +50,9 @@ export default function (view, params, tabContent) { if (userSettings.libraryPageSize() > 0) { query.StartIndex += query.Limit; } - reloadItems(context); + reloadItems(context).then(() => { + window.scrollTo(0, 0); + }); } function onPreviousPageClick() { @@ -61,18 +63,24 @@ export default function (view, params, tabContent) { if (userSettings.libraryPageSize() > 0) { query.StartIndex = Math.max(0, query.StartIndex - query.Limit); } - reloadItems(context); + reloadItems(context).then(() => { + window.scrollTo(0, 0); + }); } const query = getQuery(); - context.querySelector('.paging').innerHTML = libraryBrowser.getQueryPagingHtml({ - startIndex: query.StartIndex, - limit: query.Limit, - totalRecordCount: result.TotalRecordCount, - showLimit: false, - updatePageSizeSetting: false, - filterButton: false - }); + + for (const elem of context.querySelectorAll('.paging')) { + elem.innerHTML = libraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + showLimit: false, + updatePageSizeSetting: false, + filterButton: false + }); + } + const html = getChannelsHtml(result.Items); const elem = context.querySelector('#items'); elem.innerHTML = html; @@ -110,13 +118,13 @@ export default function (view, params, tabContent) { const query = getQuery(); const apiClient = ApiClient; query.UserId = apiClient.getCurrentUserId(); - apiClient.getLiveTvChannels(query).then(function (result) { + return apiClient.getLiveTvChannels(query).then(function (result) { renderChannels(context, result); loading.hide(); isLoading = false; import('../../components/autoFocuser').then(({default: autoFocuser}) => { - autoFocuser.autoFocus(view); + autoFocuser.autoFocus(context); }); }); }