diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html index 5dfb3cdddd..477560689c 100644 --- a/dashboard-ui/collections.html +++ b/dashboard-ui/collections.html @@ -50,8 +50,10 @@
diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 2b58e72614..6d5fb5b8d1 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -77,7 +77,7 @@ -webkit-box-shadow: 0 2px 4px rgba(0,0,0,0.1); box-shadow: 0 2px 4px rgba(0,0,0,0.1); background: #fff; - margin: 8px; + margin: 7px; } .ui-page-theme-b .visualCardBox { diff --git a/dashboard-ui/games.html b/dashboard-ui/games.html index ff3a5eb7aa..1b54894729 100644 --- a/dashboard-ui/games.html +++ b/dashboard-ui/games.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabGames} diff --git a/dashboard-ui/livetvitems.html b/dashboard-ui/livetvitems.html index d3594f3cff..46d499b131 100644 --- a/dashboard-ui/livetvitems.html +++ b/dashboard-ui/livetvitems.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabGuide} diff --git a/dashboard-ui/moviegenres.html b/dashboard-ui/moviegenres.html index 2b4fcdd946..b99eebfdcb 100644 --- a/dashboard-ui/moviegenres.html +++ b/dashboard-ui/moviegenres.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} diff --git a/dashboard-ui/moviepeople.html b/dashboard-ui/moviepeople.html index b04ce589f5..08f6c35079 100644 --- a/dashboard-ui/moviepeople.html +++ b/dashboard-ui/moviepeople.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index f41e13dada..46b9b9f962 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} diff --git a/dashboard-ui/moviestudios.html b/dashboard-ui/moviestudios.html index dffa8dd012..8a70c3070a 100644 --- a/dashboard-ui/moviestudios.html +++ b/dashboard-ui/moviestudios.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} diff --git a/dashboard-ui/movietrailers.html b/dashboard-ui/movietrailers.html index 76cf270416..637a7951cf 100644 --- a/dashboard-ui/movietrailers.html +++ b/dashboard-ui/movietrailers.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} @@ -141,9 +141,6 @@
-
diff --git a/dashboard-ui/musicalbumartists.html b/dashboard-ui/musicalbumartists.html index 5821b1b823..ab2a0a8c98 100644 --- a/dashboard-ui/musicalbumartists.html +++ b/dashboard-ui/musicalbumartists.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabSongs} diff --git a/dashboard-ui/musicalbums.html b/dashboard-ui/musicalbums.html index 5a0adf26a6..8cc87097b1 100644 --- a/dashboard-ui/musicalbums.html +++ b/dashboard-ui/musicalbums.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabSongs} diff --git a/dashboard-ui/musicartists.html b/dashboard-ui/musicartists.html index 3e1edbd5af..c0f80b0189 100644 --- a/dashboard-ui/musicartists.html +++ b/dashboard-ui/musicartists.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabSongs} diff --git a/dashboard-ui/musicvideos.html b/dashboard-ui/musicvideos.html index 00c2df7454..6f74437e5d 100644 --- a/dashboard-ui/musicvideos.html +++ b/dashboard-ui/musicvideos.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} diff --git a/dashboard-ui/photos.html b/dashboard-ui/photos.html index 338e315dd9..d6ef8e6acc 100644 --- a/dashboard-ui/photos.html +++ b/dashboard-ui/photos.html @@ -4,7 +4,7 @@ Emby -
+
${TabAlbums} diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js index f2eecd6401..fe5d252d13 100644 --- a/dashboard-ui/scripts/episodes.js +++ b/dashboard-ui/scripts/episodes.js @@ -46,12 +46,6 @@ updateFilterControls(); var trigger = false; - if (AppInfo.hasLowImageBandwidth) { - if (view == 'Poster') { - view = 'PosterCard'; - } - } - if (view == "List") { html = LibraryBrowser.getListViewHtml({ diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index da7b3f21fb..0a2cfc6188 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -1,6 +1,6 @@ (function ($, document) { - var view = "Poster"; + var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard'); // The base query options var query = { @@ -55,12 +55,6 @@ context = 'folders'; } - if (AppInfo.hasLowImageBandwidth) { - if (view == 'Poster') { - view = 'PosterCard'; - } - } - if (view == "Backdrop") { html = LibraryBrowser.getPosterViewHtml({ diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js index 06de26c69b..dbe93fd18f 100644 --- a/dashboard-ui/scripts/livetvitems.js +++ b/dashboard-ui/scripts/livetvitems.js @@ -92,7 +92,7 @@ }); } - $(document).on('pageinit', "#liveTvItemsPage", function () { + $(document).on('pageinitdepends', "#liveTvItemsPage", function () { var page = this; @@ -137,7 +137,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#liveTvItemsPage", function () { + }).on('pageshown', "#liveTvItemsPage", function () { query.ParentId = LibraryMenu.getTopParentId(); @@ -168,10 +168,6 @@ } }); - }).on('pageshow', "#liveTvItemsPage", function () { - - var page = this; - updateFilterControls(page); }); diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index d154a2130d..4845953c68 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -53,15 +53,6 @@ updateFilterControls(page); var trigger = false; - if (AppInfo.hasLowImageBandwidth) { - if (view == 'Thumb') { - view = 'ThumbCard'; - } - else if (view == 'Poster') { - view = 'PosterCard'; - } - } - if (result.TotalRecordCount) { if (view == "List") { diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js index bd269750a3..45e30b36aa 100644 --- a/dashboard-ui/scripts/moviegenres.js +++ b/dashboard-ui/scripts/moviegenres.js @@ -39,15 +39,6 @@ updateFilterControls(page); - if (AppInfo.hasLowImageBandwidth) { - if (view == 'Thumb') { - view = 'ThumbCard'; - } - else if (view == 'Poster') { - view = 'PosterCard'; - } - } - if (view == "Thumb") { html = LibraryBrowser.getPosterViewHtml({ items: result.Items, @@ -118,7 +109,7 @@ $('#selectView', page).val(view).selectmenu('refresh'); } - $(document).on('pageinit', "#movieGenresPage", function () { + $(document).on('pageinitdepends', "#movieGenresPage", function () { var page = this; @@ -163,7 +154,7 @@ LibraryBrowser.saveViewSetting(getSavedQueryKey(), view); }); - }).on('pagebeforeshow', "#movieGenresPage", function () { + }).on('pageshown', "#movieGenresPage", function () { var page = this; query.ParentId = LibraryMenu.getTopParentId(); @@ -189,8 +180,6 @@ } }); - }).on('pageshow', "#movieGenresPage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/moviepeople.js b/dashboard-ui/scripts/moviepeople.js index 5246757bcf..7d1733c7f1 100644 --- a/dashboard-ui/scripts/moviepeople.js +++ b/dashboard-ui/scripts/moviepeople.js @@ -88,7 +88,7 @@ $('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater); } - $(document).on('pageinit', "#moviePeoplePage", function () { + $(document).on('pageinitdepends', "#moviePeoplePage", function () { var page = this; @@ -140,7 +140,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#moviePeoplePage", function () { + }).on('pageshown', "#moviePeoplePage", function () { query.ParentId = LibraryMenu.getTopParentId(); @@ -156,8 +156,6 @@ reloadItems(this); - }).on('pageshow', "#moviePeoplePage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js index 8359647b84..7069bf5a4c 100644 --- a/dashboard-ui/scripts/movies.js +++ b/dashboard-ui/scripts/movies.js @@ -216,7 +216,7 @@ } } - $(document).on('pageinit', "#moviesPage", function () { + $(document).on('pageinitdepends', "#moviesPage", function () { var page = this; @@ -399,7 +399,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#moviesPage", function () { + }).on('pageshown', "#moviesPage", function () { query.ParentId = LibraryMenu.getTopParentId(); @@ -427,10 +427,6 @@ } }); - }).on('pageshow', "#moviesPage", function () { - - var page = this; - updateFilterControls(page); filtersLoaded = false; diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js index 47f1ea82d0..72c96f182a 100644 --- a/dashboard-ui/scripts/moviesrecommended.js +++ b/dashboard-ui/scripts/moviesrecommended.js @@ -2,19 +2,11 @@ function getView() { - if (AppInfo.hasLowImageBandwidth) { - return 'PosterCard'; - } - return 'PosterCard'; } function getResumeView() { - if (AppInfo.hasLowImageBandwidth) { - return 'ThumbCard'; - } - return 'ThumbCard'; } @@ -33,9 +25,6 @@ function loadLatest(page, userId, parentId) { var limit = 18; - if (AppInfo.hasLowImageBandwidth) { - limit = 10; - } var options = { diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js index 34f3a0b45d..52c72f1c95 100644 --- a/dashboard-ui/scripts/moviestudios.js +++ b/dashboard-ui/scripts/moviestudios.js @@ -72,7 +72,7 @@ $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } - $(document).on('pageinit', "#movieStudiosPage", function () { + $(document).on('pageinitdepends', "#movieStudiosPage", function () { var page = this; @@ -99,7 +99,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#movieStudiosPage", function () { + }).on('pageshown', "#movieStudiosPage", function () { query.ParentId = LibraryMenu.getTopParentId(); @@ -115,8 +115,6 @@ reloadItems(this); - }).on('pageshow', "#movieStudiosPage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js index 7ca1669682..d545053f05 100644 --- a/dashboard-ui/scripts/movietrailers.js +++ b/dashboard-ui/scripts/movietrailers.js @@ -141,7 +141,14 @@ }); } - $(document).on('pageinit', "#movieTrailersPage", function () { + function onSubmit() { + var page = $(this).parents('.page'); + + playReel(page); + return false; + } + + $(document).on('pageinitdepends', "#movieTrailersPage", function () { var page = this; @@ -206,7 +213,9 @@ }); - }).on('pagebeforeshow', "#movieTrailersPage", function () { + $('.popupTrailerReelForm').off('submit', onSubmit).on('submit', onSubmit); + + }).on('pageshown', "#movieTrailersPage", function () { query.ParentId = LibraryMenu.getTopParentId(); @@ -232,20 +241,7 @@ } }); - }).on('pageshow', "#movieTrailersPage", function () { - updateFilterControls(this); }); - window.MovieTrailerPage = { - - onSubmit: function () { - - var page = $(this).parents('.page'); - - playReel(page); - return false; - } - }; - })(jQuery, document); \ No newline at end of file diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js index 2f8a5dba88..7ee412c358 100644 --- a/dashboard-ui/scripts/musicalbumartists.js +++ b/dashboard-ui/scripts/musicalbumartists.js @@ -46,12 +46,6 @@ updateFilterControls(page); var trigger = false; - if (AppInfo.hasLowImageBandwidth) { - if (view == 'Poster') { - view = 'PosterCard'; - } - } - if (view == "List") { html = LibraryBrowser.getListViewHtml({ diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js index 2fc22a1904..248621d3a3 100644 --- a/dashboard-ui/scripts/musicalbums.js +++ b/dashboard-ui/scripts/musicalbums.js @@ -44,12 +44,6 @@ updateFilterControls(page); var trigger = false; - if (AppInfo.hasLowImageBandwidth) { - if (view == 'Poster') { - view = 'PosterCard'; - } - } - if (view == "Poster") { html = LibraryBrowser.getPosterViewHtml({ items: result.Items, diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js index b127748851..9b88edc4d4 100644 --- a/dashboard-ui/scripts/musicartists.js +++ b/dashboard-ui/scripts/musicartists.js @@ -47,12 +47,6 @@ updateFilterControls(page); var trigger = false; - if (AppInfo.hasLowImageBandwidth) { - if (view == 'Poster') { - view = 'PosterCard'; - } - } - if (view == "List") { html = LibraryBrowser.getListViewHtml({ diff --git a/dashboard-ui/scripts/musicgenres.js b/dashboard-ui/scripts/musicgenres.js index 196d028b7e..fe23e45445 100644 --- a/dashboard-ui/scripts/musicgenres.js +++ b/dashboard-ui/scripts/musicgenres.js @@ -1,5 +1,7 @@ (function ($, document) { + var view = LibraryBrowser.getDefaultItemsView('Thumb', 'ThumbCard'); + // The base query options var query = { @@ -26,13 +28,6 @@ $(document).scrollTop(0); var html = ''; - var view = 'Thumb'; - - if (AppInfo.hasLowImageBandwidth) { - if (view == 'Thumb') { - view = 'ThumbCard'; - } - } $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ startIndex: query.StartIndex, diff --git a/dashboard-ui/scripts/musicvideos.js b/dashboard-ui/scripts/musicvideos.js index dc78a8bdfd..0cea101144 100644 --- a/dashboard-ui/scripts/musicvideos.js +++ b/dashboard-ui/scripts/musicvideos.js @@ -1,5 +1,7 @@ (function ($, document) { + var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard'); + // The base query options var query = { @@ -37,14 +39,6 @@ updateFilterControls(page); - var view = 'Poster'; - - if (AppInfo.hasLowImageBandwidth) { - if (view == 'Poster') { - view = 'PosterCard'; - } - } - if (view == "Poster") { html = LibraryBrowser.getPosterViewHtml({ items: result.Items, diff --git a/dashboard-ui/scripts/photos.js b/dashboard-ui/scripts/photos.js index 1f2062b615..d6cfe094d4 100644 --- a/dashboard-ui/scripts/photos.js +++ b/dashboard-ui/scripts/photos.js @@ -40,12 +40,6 @@ updateFilterControls(page); - if (AppInfo.hasLowImageBandwidth) { - if (view == 'Poster') { - view = 'PosterCard'; - } - } - if (view == "Poster") { // Poster html = LibraryBrowser.getPosterViewHtml({ @@ -218,7 +212,7 @@ } } - $(document).on('pageinit', "#photosPage", function () { + $(document).on('pageinitdepends', "#photosPage", function () { var page = this; @@ -283,7 +277,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#photosPage", function () { + }).on('pageshown', "#photosPage", function () { var page = this; @@ -311,8 +305,6 @@ } }); - }).on('pageshow', "#photosPage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/queryfilters.js b/dashboard-ui/scripts/queryfilters.js new file mode 100644 index 0000000000..4499440988 --- /dev/null +++ b/dashboard-ui/scripts/queryfilters.js @@ -0,0 +1,158 @@ +(function (window) { + + function renderOptions(page, selector, cssClass, items) { + + var elem; + + if (items.length) { + + elem = $(selector, page).show(); + + } else { + elem = $(selector, page).hide(); + } + + var html = ''; + + // style="margin: -.2em -.8em;" + html += '
'; + + var index = 0; + var idPrefix = 'chk' + selector.substring(1); + + html += items.map(function (filter) { + + var itemHtml = ''; + + var id = idPrefix + index; + itemHtml += ''; + itemHtml += ''; + + index++; + + return itemHtml; + + }).join(''); + + html += '
'; + + $('.filterOptions', elem).html(html).trigger('create'); + } + + function renderFilters(page, result) { + + // If there's a huge number of these they will be really show to render + if (result.Tags) { + result.Tags.length = Math.min(result.Tags.length, 50); + } + + renderOptions(page, '.genreFilters', 'chkGenreFilter', result.Genres); + renderOptions(page, '.officialRatingFilters', 'chkOfficialRatingFilter', result.OfficialRatings); + renderOptions(page, '.tagFilters', 'chkTagFilter', result.Tags); + renderOptions(page, '.yearFilters', 'chkYearFilter', result.Years); + + } + + function onFiltersLoaded(page, query, reloadItemsFn) { + + $('.chkGenreFilter', page).on('change', function () { + + var filterName = this.getAttribute('data-filter'); + var filters = query.Genres || ""; + var delimiter = '|'; + + filters = (delimiter + filters).replace(delimiter + filterName, '').substring(1); + + if (this.checked) { + filters = filters ? (filters + delimiter + filterName) : filterName; + } + + query.StartIndex = 0; + query.Genres = filters; + + reloadItemsFn(); + }); + $('.chkTagFilter', page).on('change', function () { + + var filterName = this.getAttribute('data-filter'); + var filters = query.Tags || ""; + var delimiter = '|'; + + filters = (delimiter + filters).replace(delimiter + filterName, '').substring(1); + + if (this.checked) { + filters = filters ? (filters + delimiter + filterName) : filterName; + } + + query.StartIndex = 0; + query.Tags = filters; + + reloadItemsFn(); + }); + $('.chkYearFilter', page).on('change', function () { + + var filterName = this.getAttribute('data-filter'); + var filters = query.Years || ""; + var delimiter = ','; + + filters = (delimiter + filters).replace(delimiter + filterName, '').substring(1); + + if (this.checked) { + filters = filters ? (filters + delimiter + filterName) : filterName; + } + + query.StartIndex = 0; + query.Years = filters; + + reloadItemsFn(); + }); + $('.chkOfficialRatingFilter', page).on('change', function () { + + var filterName = this.getAttribute('data-filter'); + var filters = query.OfficialRatings || ""; + var delimiter = '|'; + + filters = (delimiter + filters).replace(delimiter + filterName, '').substring(1); + + if (this.checked) { + filters = filters ? (filters + delimiter + filterName) : filterName; + } + + query.StartIndex = 0; + query.OfficialRatings = filters; + + reloadItemsFn(); + }); + } + + function loadFilters(page, userId, itemQuery, reloadItemsFn) { + + return ApiClient.getJSON(ApiClient.getUrl('Items/Filters', { + + UserId: userId, + ParentId: itemQuery.ParentId, + IncludeItemTypes: itemQuery.IncludeItemTypes + + + })).done(function (result) { + + renderFilters(page, result); + + onFiltersLoaded(page, itemQuery, reloadItemsFn); + }); + + } + + function onPageShow(page, query) { + query.Genres = null; + query.Years = null; + query.OfficialRatings = null; + query.Tags = null; + } + + window.QueryFilters = { + loadFilters: loadFilters, + onPageShow: onPageShow + }; + +})(window); \ No newline at end of file diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js index 5a3fd1ee49..ff9af83ede 100644 --- a/dashboard-ui/scripts/songs.js +++ b/dashboard-ui/scripts/songs.js @@ -130,7 +130,7 @@ } } - $(document).on('pageinit', "#songsPage", function () { + $(document).on('pageinitdepends', "#songsPage", function () { var page = this; @@ -174,7 +174,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#songsPage", function () { + }).on('pageshown', "#songsPage", function () { var page = this; @@ -185,8 +185,6 @@ reloadItems(page); - }).on('pageshow', "#songsPage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js index a36f19466b..ef55d3a9f5 100644 --- a/dashboard-ui/scripts/tvgenres.js +++ b/dashboard-ui/scripts/tvgenres.js @@ -39,15 +39,6 @@ updateFilterControls(page); - if (AppInfo.hasLowImageBandwidth) { - if (view == 'Thumb') { - view = 'ThumbCard'; - } - else if (view == 'Poster') { - view = 'PosterCard'; - } - } - if (view == "Thumb") { html = LibraryBrowser.getPosterViewHtml({ items: result.Items, diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js index bf221a6ebb..9c3e03983d 100644 --- a/dashboard-ui/scripts/tvrecommended.js +++ b/dashboard-ui/scripts/tvrecommended.js @@ -105,6 +105,14 @@ }); } + function enableScrollX() { + return AppInfo.isTouchPreferred; + } + + function getThumbShape() { + return enableScrollX() ? 'overflowBackdrop' : 'backdrop'; + } + function loadResume(page) { var parentId = LibraryMenu.getTopParentId(); @@ -146,7 +154,7 @@ html += LibraryBrowser.getPosterViewHtml({ items: result.Items, - shape: "backdrop", + shape: getThumbShape(), showTitle: true, showParentTitle: true, lazy: true, @@ -159,7 +167,7 @@ html += LibraryBrowser.getPosterViewHtml({ items: result.Items, - shape: "backdrop", + shape: getThumbShape(), showTitle: true, showParentTitle: true, overlayText: screenWidth >= 800 && !AppInfo.hasLowImageBandwidth, @@ -178,6 +186,12 @@ var page = this; + if (enableScrollX()) { + $('#resumableItems', page).addClass('hiddenScrollX'); + } else { + $('#resumableItems', page).removeClass('hiddenScrollX'); + } + reload(page); }); diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index e2a207086a..33ec3a8eb4 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -202,7 +202,7 @@ } } - $(document).on('pageinit', "#tvShowsPage", function () { + $(document).on('pageinitdepends', "#tvShowsPage", function () { var page = this; @@ -360,7 +360,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#tvShowsPage", function () { + }).on('pageshown', "#tvShowsPage", function () { query.ParentId = LibraryMenu.getTopParentId(); @@ -387,8 +387,6 @@ } }); - }).on('pageshow', "#tvShowsPage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js index fd53a129f1..55aa397256 100644 --- a/dashboard-ui/scripts/tvupcoming.js +++ b/dashboard-ui/scripts/tvupcoming.js @@ -5,7 +5,7 @@ var page = this; var limit = AppInfo.hasLowImageBandwidth ? - 18 : + 24 : 40; var query = { diff --git a/dashboard-ui/songs.html b/dashboard-ui/songs.html index 184a73a74e..284a90ad78 100644 --- a/dashboard-ui/songs.html +++ b/dashboard-ui/songs.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabSongs} diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html index 2c1ffcc642..56ca05ec35 100644 --- a/dashboard-ui/tvshows.html +++ b/dashboard-ui/tvshows.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabLatest}