diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js index d2d3b5f46d..2dfecc854a 100644 --- a/dashboard-ui/scripts/channelitems.js +++ b/dashboard-ui/scripts/channelitems.js @@ -127,15 +127,16 @@ $(document).scrollTop(0); var html = ''; - - $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, viewButton: true, showLimit: false, updatePageSizeSetting: false - })).trigger('create'); + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -149,7 +150,9 @@ coverImage: true }); - $('#items', page).html(html).lazyChildren(); + var elem = $('#items', page).html(html).lazyChildren(); + + $(pagingHtml).appendTo(elem).trigger('create'); $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js index 4502d28eda..1a8b325cc4 100644 --- a/dashboard-ui/scripts/episodes.js +++ b/dashboard-ui/scripts/episodes.js @@ -32,15 +32,16 @@ $(document).scrollTop(0); var html = ''; - - $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, viewButton: true, showLimit: false, addSelectionButton: true - })).trigger('create'); + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(); var trigger = false; @@ -77,12 +78,14 @@ }); } - $('.itemsContainer', page).html(html).lazyChildren(); + var elem = $('.itemsContainer', page).html(html).lazyChildren(); if (trigger) { - $('.itemsContainer', page).trigger('create'); + elem.trigger('create'); } + $(pagingHtml).appendTo(elem).trigger('create'); + $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index b2505a3260..5c96157e6b 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -37,14 +37,15 @@ $(document).scrollTop(0); var html = ''; - - $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, viewButton: true, showLimit: false - })).trigger('create'); + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -79,7 +80,9 @@ }); } - $('#items', page).html(html).lazyChildren(); + var elem = $('#items', page).html(html).lazyChildren(); + + $(pagingHtml).appendTo(elem).trigger('create'); $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; diff --git a/dashboard-ui/scripts/moviepeople.js b/dashboard-ui/scripts/moviepeople.js index dfec1b8e0a..a9fe5f7e57 100644 --- a/dashboard-ui/scripts/moviepeople.js +++ b/dashboard-ui/scripts/moviepeople.js @@ -30,8 +30,7 @@ $(document).scrollTop(0); var html = ''; - - $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, @@ -39,7 +38,9 @@ showLimit: false, updatePageSizeSetting: false, pageSizeKey: pageSizeKey - })).trigger('create'); + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -53,7 +54,9 @@ lazy: true }); - $('#items', page).html(html).lazyChildren(); + var elem = $('#items', page).html(html).lazyChildren(); + + $(pagingHtml).appendTo(elem).trigger('create'); $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js index c086245833..ef396db10f 100644 --- a/dashboard-ui/scripts/movies.js +++ b/dashboard-ui/scripts/movies.js @@ -33,14 +33,17 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, viewButton: true, showLimit: false, addSelectionButton: true - })).trigger('create'); + + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); var trigger = false; @@ -122,12 +125,14 @@ }); } - $('.itemsContainer', page).html(html).lazyChildren(); + var elem = $('.itemsContainer', page).html(html).lazyChildren(); if (trigger) { - $('.itemsContainer', page).trigger('create'); + $(elem).trigger('create'); } + $(pagingHtml).appendTo(elem).trigger('create'); + $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js index c47bba251b..4f15323522 100644 --- a/dashboard-ui/scripts/moviestudios.js +++ b/dashboard-ui/scripts/moviestudios.js @@ -26,14 +26,15 @@ $(document).scrollTop(0); var html = ''; - - $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, viewButton: true, showLimit: false - })).trigger('create'); + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -46,7 +47,9 @@ centerText: true }); - $('#items', page).html(html).trigger('create'); + var elem = $('#items', page).html(html).trigger('create'); + + $(pagingHtml).appendTo(elem).trigger('create'); $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js index 7cc3f9760c..3b4859a8db 100644 --- a/dashboard-ui/scripts/movietrailers.js +++ b/dashboard-ui/scripts/movietrailers.js @@ -38,14 +38,15 @@ } var html = ''; - - $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, viewButton: true, showLimit: false - })).trigger('create'); + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -59,7 +60,9 @@ overlayText: false }); - $('.itemsContainer', page).html(html).lazyChildren(); + var elem = $('.itemsContainer', page).html(html).lazyChildren(); + + $(pagingHtml).appendTo(elem).trigger('create'); $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js index 2945403f8e..020dba4150 100644 --- a/dashboard-ui/scripts/musicalbumartists.js +++ b/dashboard-ui/scripts/musicalbumartists.js @@ -31,8 +31,7 @@ $(document).scrollTop(0); var html = ''; - - $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, @@ -40,7 +39,9 @@ showLimit: false, addSelectionButton: true, pageSizeKey: pageSizeKey - })).trigger('create'); + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); var trigger = false; @@ -79,12 +80,14 @@ }); } - $('#items', page).html(html).lazyChildren(); + var elem = $('#items', page).html(html).lazyChildren(); if (trigger) { - $('#items', page).trigger('create'); + elem.trigger('create'); } + $(pagingHtml).appendTo(elem).trigger('create'); + $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js index 2ed3370172..6e7e118420 100644 --- a/dashboard-ui/scripts/musicalbums.js +++ b/dashboard-ui/scripts/musicalbums.js @@ -30,15 +30,16 @@ $(document).scrollTop(0); var html = ''; - - $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, viewButton: true, showLimit: false, addSelectionButton: true - })).trigger('create'); + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); var trigger = false; @@ -87,12 +88,14 @@ }); } - $('#items', page).html(html).lazyChildren(); + var elem = $('#items', page).html(html).lazyChildren(); if (trigger) { - $('#items', page).trigger('create'); + elem.trigger('create'); } + $(pagingHtml).appendTo(elem).trigger('create'); + $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js index 2c3c5206ca..679849c15d 100644 --- a/dashboard-ui/scripts/musicartists.js +++ b/dashboard-ui/scripts/musicartists.js @@ -32,7 +32,7 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, @@ -40,7 +40,9 @@ showLimit: false, addSelectionButton: true, pageSizeKey: pageSizeKey - })).trigger('create'); + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -77,7 +79,13 @@ }); } - $('#items', page).html(html).lazyChildren(); + var elem = $('#items', page).html(html).lazyChildren(); + + if (trigger) { + elem.trigger('create'); + } + + $(pagingHtml).appendTo(elem).trigger('create'); $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js index 225e0570ff..80c43f8850 100644 --- a/dashboard-ui/scripts/songs.js +++ b/dashboard-ui/scripts/songs.js @@ -48,14 +48,15 @@ $(document).scrollTop(0); var html = ''; - - $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, viewButton: true, showLimit: false - })).trigger('create'); + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -66,7 +67,9 @@ defaultAction: 'play' }); - $('#items', page).html(html).trigger('create').lazyChildren(); + var elem = $('#items', page).html(html).trigger('create').lazyChildren(); + + $(pagingHtml).appendTo(elem).trigger('create'); $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js index dded57082a..f314af0a28 100644 --- a/dashboard-ui/scripts/tvpeople.js +++ b/dashboard-ui/scripts/tvpeople.js @@ -30,14 +30,15 @@ $(document).scrollTop(0); var html = ''; - - $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, viewButton: true, showLimit: false - })).trigger('create'); + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -51,7 +52,9 @@ lazy: true }); - $('#items', page).html(html).lazyChildren(); + var elem = $('#items', page).html(html).lazyChildren(); + + $(pagingHtml).appendTo(elem).trigger('create'); $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index 416da07b20..ce6cee7499 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -31,14 +31,15 @@ var html = ''; var trigger = false; - - $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, viewButton: true, showLimit: false - })).trigger('create'); + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -109,12 +110,14 @@ }); } - $('#items', page).html(html).lazyChildren(); + var elem = $('#items', page).html(html).lazyChildren(); if (trigger) { - $('#items', page).trigger('create'); + elem.trigger('create'); } + $(pagingHtml).appendTo(elem).trigger('create'); + $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page);