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 duplicate latest recordings section

Browse source
This commit is contained in:
Luke Pulverenti 2016-12-20 00:22:31 -05:00
parent 71980ad405
commit 61a71a50fb
11 changed files with 77 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dashboard-ui/scripts/itemdetailpage.js
View file

@ -1,4 +1,4 @@
define(['layoutManager', 'cardBuilder', 'datetime', 'mediaInfo', 'backdrop', 'listView', 'itemContextMenu', 'itemHelper', 'userdataButtons', 'dom', 'indicators', 'apphost', 'imageLoader', 'libraryMenu', 'shell', 'globalize', 'browser', 'events', 'scrollStyles', 'emby-itemscontainer', 'emby-checkbox'], function (layoutManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, userdataButtons, dom, indicators, appHost, imageLoader, libraryMenu, shell, globalize, browser, events) {
define(['layoutManager', 'cardBuilder', 'datetime', 'mediaInfo', 'backdrop', 'listView', 'itemContextMenu', 'itemHelper', 'userdataButtons', 'dom', 'indicators', 'apphost', 'imageLoader', 'libraryMenu', 'shell', 'globalize', 'browser', 'events', 'scrollHelper', 'scrollStyles', 'emby-itemscontainer', 'emby-checkbox'], function (layoutManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, userdataButtons, dom, indicators, appHost, imageLoader, libraryMenu, shell, globalize, browser, events, scrollHelper) {
'use strict';
function getPromise(params) {
@ -79,7 +79,6 @@
positionTo: button,
cancelTimer: false,
record: false,
editImages: false,
deleteItem: item.IsFolder === true
};
@ -1355,6 +1354,13 @@
renderCollectionItems(page, item, collectionItemTypes, result.Items);
}
else if (item.Type === 'Episode') {
var card = childrenItemsContainer.querySelector('.card[data-id="' + item.Id + '"]');
if (card) {
scrollHelper.toStart(childrenItemsContainer, card.previousSibling || card, true);
}
}
});
if (item.Type == "Season") {

5
dashboard-ui/scripts/sections.js
View file

@ -207,7 +207,7 @@
html += '<h1>Try Emby Theater<button is="paper-icon-button-light" style="margin-left:1em;" onclick="this.parentNode.parentNode.remove();" class="autoSize"><i class="md-icon">close</i></button></h1>';
var nameText = AppInfo.isNativeApp ? 'Emby Theater' : '<a href="https://emby.media/download" target="_blank">Emby Theater</a>';
html += '<p>A beautiful app for your TV and large screen tablet. ' + nameText + ' runs on Windows, Xbox One, Google Chrome, FireFox, Microsoft Edge and Opera.</p>';
html += '<p>A beautiful app for your TV and large screen tablet. ' + nameText + ' runs on Windows, Xbox One, Raspberry Pi, Samsung Smart TVs, Sony PS4, Web Browsers, and more.</p>';
html += '<div class="itemsContainer vertical-wrap">';
html += getCard('https://raw.githubusercontent.com/MediaBrowser/Emby.Resources/master/apps/theater1.png', 'https://emby.media/download');
html += getCard('https://raw.githubusercontent.com/MediaBrowser/Emby.Resources/master/apps/theater2.png', 'https://emby.media/download');
@ -650,7 +650,8 @@
limit: 5,
Fields: "PrimaryImageAspectRatio,BasicSyncInfo",
IsInProgress: false,
EnableTotalRecordCount: false
EnableTotalRecordCount: false,
IsLibraryItem: false
}).then(function (result) {