diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js index a54676c30b..7f1c760ff2 100644 --- a/dashboard-ui/scripts/channelitems.js +++ b/dashboard-ui/scripts/channelitems.js @@ -9,7 +9,7 @@ }; function getSavedQueryId() { - return 'channels-' + getParameterByName('id') + (getParameterByName('categoryId') || ''); + return 'channels-' + (getParameterByName('categoryId') || ''); } function showLoadingMessage(page) { @@ -34,6 +34,10 @@ $('.categoryTitle', page).html(item.Name); }); + + if (categoryId) { + query.categoryId = categoryId; + } $.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Items", query)).done(function (result) { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 82ea50ae3e..b84f89d170 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -479,9 +479,14 @@ if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.777777778) < .3) { options.shape = 'backdrop'; } - else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1) < .3) { + else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1) < .34) { + options.coverImage = true; options.shape = 'square'; } + else if (primaryImageAspectRatio && primaryImageAspectRatio > 1.9) { + options.shape = 'banner'; + options.coverImage = true; + } else { options.shape = 'portrait'; } diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 946dd5272d..7d10593b0b 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -78,6 +78,14 @@ function showLibraryMenu() { + var panel = getLibraryMenu(); + + updateLibraryNavLinks($.mobile.activePage); + + $(panel).panel('toggle'); + } + + function updateLibraryMenu(panel) { var userId = Dashboard.getCurrentUserId(); ApiClient.getItems(userId, { @@ -99,14 +107,6 @@ $('.libraryMenuOptions').html(html); }); - var page = $.mobile.activePage; - - var panel = getLibraryMenu(); - - updateLibraryNavLinks(page); - - $(panel).panel('toggle'); - ApiClient.getLiveTvInfo().done(function (liveTvInfo) { var showLiveTv = liveTvInfo.EnabledUsers.indexOf(userId) != -1; @@ -163,6 +163,8 @@ $(document.body).append(html); panel = $('#libraryPanel').panel({}).trigger('create'); + + updateLibraryMenu(); } return panel;