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

support sending channel paging direct to the provider

This commit is contained in:
Luke Pulverenti 2014-05-19 15:51:56 -04:00
parent 704fa77349
commit 88bcd847e2
7 changed files with 44 additions and 13 deletions

View file

@ -10,6 +10,8 @@
<a href="channels.html" class="ui-btn-active">${TabChannels}</a> <a href="channels.html" class="ui-btn-active">${TabChannels}</a>
</div> </div>
<div class="channelHeader"></div>
<div data-role="content"> <div data-role="content">
<div class="viewSettings"> <div class="viewSettings">

View file

@ -103,7 +103,7 @@
@media all and (min-width: 1600px) { @media all and (min-width: 1600px) {
.ehsContent { .homeEhsContent {
max-width: 1540px; max-width: 1540px;
} }
@ -1162,3 +1162,12 @@ a.itemTag:hover {
overflow-x: visible!important; overflow-x: visible!important;
} }
} }
.channelHeader {
padding: 1em;
text-align: center;
}
.channelHeader a {
text-decoration: none;
}

View file

@ -100,6 +100,7 @@
top: 51px; top: 51px;
z-index: 1000; z-index: 1000;
background-color: #181818; background-color: #181818;
background-color: rgba(24, 24, 24, .95);
} }
@media all and (max-width: 460px) { @media all and (max-width: 460px) {
@ -298,4 +299,4 @@
.headerSettingsButton { .headerSettingsButton {
display: none; display: none;
} }
} }

View file

@ -8,7 +8,7 @@
<div data-role="content"> <div data-role="content">
<table class="ehsContent"> <table class="ehsContent homeEhsContent">
<tr> <tr>
<td> <td>
<h1 class="listHeader">${HeaderMyLibrary}</h1> <h1 class="listHeader">${HeaderMyLibrary}</h1>

View file

@ -91,6 +91,9 @@
<a href="gamestudios.html">${TabStudios}</a> <a href="gamestudios.html">${TabStudios}</a>
</div> </div>
</div> </div>
<div class="channelHeader" style="display: none;"></div>
<div id="itemBackdrop" class="itemBackdrop noBackdrop"> <div id="itemBackdrop" class="itemBackdrop noBackdrop">
<div class="itemBackdropContent"> <div class="itemBackdropContent">
<table class="detailPageContent primaryDetailPageContent"> <table class="detailPageContent primaryDetailPageContent">

View file

@ -30,13 +30,26 @@
query.UserId = Dashboard.getCurrentUserId(); query.UserId = Dashboard.getCurrentUserId();
ApiClient.getItem(query.UserId, categoryId || channelId).done(function (item) {
$('.categoryTitle', page).html(item.Name); if (categoryId) {
});
ApiClient.getItem(query.UserId, categoryId).done(function (item) {
$('.categoryTitle', page).show().html(item.Name);
$('.channelHeader', page).show().html('<a href="channelitems.html?id=' + item.ChannelId + '">' + item.ChannelName + '</a>').trigger('create');
});
} else {
ApiClient.getItem(query.UserId, channelId).done(function (item) {
$('.categoryTitle', page).hide().html(item.Name);
$('.channelHeader', page).show().html('<a href="channelitems.html?id=' + item.Id + '">' + item.Name + '</a>');
});
}
query.categoryId = categoryId; query.categoryId = categoryId;
query.Limit = 50;
$.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
@ -79,9 +92,9 @@
LibraryBrowser.saveQueryValues(getSavedQueryId(), query); LibraryBrowser.saveQueryValues(getSavedQueryId(), query);
}).always(function() { }).always(function () {
hideLoadingMessage(page); hideLoadingMessage(page);
}); });
} }
@ -171,8 +184,8 @@
// If the default page size has changed, the start index will have to be reset // If the default page size has changed, the start index will have to be reset
if (limit != query.Limit) { if (limit != query.Limit) {
query.Limit = limit; query.Limit = limit;
query.StartIndex = 0;
} }
query.StartIndex = 0;
LibraryBrowser.loadSavedQueryValues(getSavedQueryId(), query); LibraryBrowser.loadSavedQueryValues(getSavedQueryId(), query);

View file

@ -186,6 +186,9 @@
if (item.Type == "ChannelVideoItem" || item.Type == "ChannelAudioItem" || item.Type == "ChannelCategoryItem") { if (item.Type == "ChannelVideoItem" || item.Type == "ChannelAudioItem" || item.Type == "ChannelCategoryItem") {
$('#channelTabs', page).show(); $('#channelTabs', page).show();
$('.channelHeader', page).show().html('<a href="channelitems.html?id=' + item.ChannelId + '">' + item.ChannelName + '</a>').trigger('create');
} else {
$('.channelHeader', page).hide();
} }
if (item.Type == "BoxSet") { if (item.Type == "BoxSet") {
@ -350,7 +353,7 @@
tabsHtml += '<label for="radioDetails" class="lblDetailTab">Details</label>'; tabsHtml += '<label for="radioDetails" class="lblDetailTab">Details</label>';
} }
if (item.MediaSources && item.MediaSources.length) { if (item.MediaSources && item.MediaSources.length && item.Path) {
tabsHtml += '<input type="radio" name="radioDetailTab" class="radioDetailTab" id="radioMediaInfo" value="tabMediaInfo">'; tabsHtml += '<input type="radio" name="radioDetailTab" class="radioDetailTab" id="radioMediaInfo" value="tabMediaInfo">';
tabsHtml += '<label for="radioMediaInfo" class="lblDetailTab">Media Info</label>'; tabsHtml += '<label for="radioMediaInfo" class="lblDetailTab">Media Info</label>';
} }