mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

fix channel query by category

Browse source
This commit is contained in:
Luke Pulverenti 2014-05-17 17:23:48 -04:00
parent 2cae955857
commit 382c0e393c
3 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/scripts/channelitems.js
View file

@ -9,7 +9,7 @@
}; };
function getSavedQueryId() { function getSavedQueryId() {
return 'channels-' + getParameterByName('id') + (getParameterByName('categoryId') || ''); return 'channels-' + (getParameterByName('categoryId') || '');
} }
function showLoadingMessage(page) { function showLoadingMessage(page) {
@ -35,6 +35,10 @@
$('.categoryTitle', page).html(item.Name); $('.categoryTitle', page).html(item.Name);
}); });
if (categoryId) {
query.categoryId = categoryId;
}
$.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Items", query)).done(function (result) { $.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Items", query)).done(function (result) {
// Scroll back up so they can see the results from the beginning // Scroll back up so they can see the results from the beginning

7
dashboard-ui/scripts/librarybrowser.js
View file

@ -479,9 +479,14 @@
if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.777777778) < .3) { if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.777777778) < .3) {
options.shape = 'backdrop'; 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'; options.shape = 'square';
} }
else if (primaryImageAspectRatio && primaryImageAspectRatio > 1.9) {
options.shape = 'banner';
options.coverImage = true;
}
else { else {
options.shape = 'portrait'; options.shape = 'portrait';
} }

18
dashboard-ui/scripts/librarymenu.js
View file

@ -78,6 +78,14 @@
function showLibraryMenu() { function showLibraryMenu() {
var panel = getLibraryMenu();
updateLibraryNavLinks($.mobile.activePage);
$(panel).panel('toggle');
}
function updateLibraryMenu(panel) {
var userId = Dashboard.getCurrentUserId(); var userId = Dashboard.getCurrentUserId();
ApiClient.getItems(userId, { ApiClient.getItems(userId, {
@ -99,14 +107,6 @@
$('.libraryMenuOptions').html(html); $('.libraryMenuOptions').html(html);
}); });
var page = $.mobile.activePage;
var panel = getLibraryMenu();
updateLibraryNavLinks(page);
$(panel).panel('toggle');
ApiClient.getLiveTvInfo().done(function (liveTvInfo) { ApiClient.getLiveTvInfo().done(function (liveTvInfo) {
var showLiveTv = liveTvInfo.EnabledUsers.indexOf(userId) != -1; var showLiveTv = liveTvInfo.EnabledUsers.indexOf(userId) != -1;
@ -163,6 +163,8 @@
$(document.body).append(html); $(document.body).append(html);
panel = $('#libraryPanel').panel({}).trigger('create'); panel = $('#libraryPanel').panel({}).trigger('create');
updateLibraryMenu();
} }
return panel; return panel;