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

update playlist content

This commit is contained in:
Luke Pulverenti 2016-10-12 14:23:09 -04:00
parent a511a2fa84
commit d08286c538
24 changed files with 1115 additions and 156 deletions

View file

@ -1,4 +1,4 @@
define(['datetime', 'cardBuilder', 'listView'], function (datetime, cardBuilder, listView) {
define(['datetime', 'cardBuilder', 'apphost'], function (datetime, cardBuilder, appHost) {
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
@ -81,6 +81,9 @@
html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap">';
}
var supportsImageAnalysis = appHost.supports('imageanalysis');
var cardLayout = appHost.preferVisualCards || supportsImageAnalysis;
html += cardBuilder.getCardsHtml({
items: group.items,
shape: getBackdropShape(),
@ -88,8 +91,9 @@
showAirTime: true,
showAirEndTime: true,
showChannelName: true,
cardLayout: true,
vibrant: true,
cardLayout: cardLayout,
centerText: !cardLayout,
vibrant: supportsImageAnalysis,
action: 'edit',
cardFooterAside: 'none',
preferThumb: true,

View file

@ -1,4 +1,4 @@
define(['components/categorysyncbuttons', 'cardBuilder', 'scripts/livetvcomponents', 'emby-button', 'listViewStyle', 'emby-itemscontainer'], function (categorysyncbuttons, cardBuilder) {
define(['components/categorysyncbuttons', 'cardBuilder', 'apphost', 'scripts/livetvcomponents', 'emby-button', 'listViewStyle', 'emby-itemscontainer'], function (categorysyncbuttons, cardBuilder, appHost) {
function getRecordingGroupHtml(group) {
@ -76,6 +76,9 @@
recordingItems.classList.add('vertical-wrap');
}
var supportsImageAnalysis = appHost.supports('imageanalysis');
var cardLayout = appHost.preferVisualCards || supportsImageAnalysis;
recordingItems.innerHTML = cardBuilder.getCardsHtml(Object.assign({
items: recordings,
shape: (enableScrollX() ? 'autooverflow' : 'auto'),
@ -83,8 +86,9 @@
showParentTitle: true,
coverImage: true,
lazy: true,
cardLayout: true,
vibrant: true,
cardLayout: cardLayout,
centerText: !cardLayout,
vibrant: supportsImageAnalysis,
allowBottomPadding: !enableScrollX(),
preferThumb: 'auto'

View file

@ -1,4 +1,4 @@
define(['cardBuilder', 'scripts/livetvcomponents', 'emby-button', 'emby-itemscontainer'], function (cardBuilder) {
define(['cardBuilder', 'apphost', 'scripts/livetvcomponents', 'emby-button', 'emby-itemscontainer'], function (cardBuilder, appHost) {
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
@ -22,15 +22,18 @@
recordingItems.classList.add('vertical-wrap');
}
var supportsImageAnalysis = appHost.supports('imageanalysis');
var cardLayout = appHost.preferVisualCards || supportsImageAnalysis;
recordingItems.innerHTML = cardBuilder.getCardsHtml(Object.assign({
items: recordings,
shape: (enableScrollX() ? 'autooverflow' : 'auto'),
showTitle: true,
showParentTitle: true,
coverImage: true,
lazy: true,
cardLayout: true,
vibrant: true,
cardLayout: cardLayout,
centerText: !cardLayout,
vibrant: supportsImageAnalysis,
allowBottomPadding: !enableScrollX(),
preferThumb: 'auto'
@ -59,8 +62,6 @@
showAirTime: true,
showAirEndTime: true,
showChannelName: true,
cardLayout: true,
vibrant: true,
preferThumb: true,
coverImage: true,
overlayText: false

View file

@ -1,4 +1,4 @@
define(['datetime', 'cardBuilder', 'imageLoader', 'paper-icon-button-light', 'emby-button'], function (datetime, cardBuilder, imageLoader) {
define(['datetime', 'cardBuilder', 'imageLoader', 'apphost', 'paper-icon-button-light', 'emby-button'], function (datetime, cardBuilder, imageLoader, appHost) {
var query = {
@ -10,17 +10,22 @@
var html = '';
var supportsImageAnalysis = appHost.supports('imageanalysis');
var cardLayout = appHost.preferVisualCards || supportsImageAnalysis;
html += cardBuilder.getCardsHtml({
items: timers,
shape: 'backdrop',
showTitle: true,
cardLayout: true,
vibrant: true,
cardLayout: cardLayout,
vibrant: supportsImageAnalysis,
preferThumb: true,
coverImage: true,
overlayText: false,
showSeriesTimerTime: true,
showSeriesTimerChannel: true
showSeriesTimerChannel: true,
centerText: !cardLayout,
overlayMoreButton: !cardLayout
});
var elem = context.querySelector('#items');

View file

@ -1,4 +1,4 @@
define(['listView', 'cardBuilder', 'libraryBrowser', 'emby-itemscontainer'], function (listView, cardBuilder, libraryBrowser) {
define(['listView', 'cardBuilder', 'libraryBrowser', 'apphost', 'emby-itemscontainer'], function (listView, cardBuilder, libraryBrowser, appHost) {
return function (view, params) {
@ -18,7 +18,7 @@
StartIndex: 0,
Limit: LibraryBrowser.getDefaultPageSize()
},
view: LibraryBrowser.getSavedView(key) || 'PosterCard'
view: LibraryBrowser.getSavedView(key) || appHost.preferVisualCards ? 'PosterCard' : 'Poster'
};
pageData.query.ParentId = LibraryMenu.getTopParentId();
@ -117,7 +117,8 @@
lazy: true,
coverImage: true,
showItemCounts: true,
cardLayout: true
cardLayout: true,
vibrant: true
});
}
else if (viewStyle == "Thumb") {
@ -139,7 +140,8 @@
lazy: true,
preferThumb: true,
cardLayout: true,
showItemCounts: true
showItemCounts: true,
vibrant: true
});
}
else {

View file

@ -1155,7 +1155,7 @@ var AppInfo = {};
var paths = {
velocity: bowerPath + "/velocity/velocity.min",
vibrant: bowerPath + "/vibrant/dist/vibrant.min",
vibrant: bowerPath + "/vibrant/dist/vibrant",
ironCardList: 'components/ironcardlist/ironcardlist',
scrollThreshold: 'components/scrollthreshold',
playlisteditor: 'components/playlisteditor/playlisteditor',
@ -1185,7 +1185,6 @@ var AppInfo = {};
globalize: embyWebComponentsBowerPath + "/globalize",
itemHelper: embyWebComponentsBowerPath + '/itemhelper',
itemShortcuts: embyWebComponentsBowerPath + "/shortcuts",
imageLoader: embyWebComponentsBowerPath + "/images/imagehelper",
serverNotifications: embyWebComponentsBowerPath + '/servernotifications',
webAnimations: bowerPath + '/web-animations-js/web-animations-next-lite.min'
};
@ -1213,6 +1212,7 @@ var AppInfo = {};
define("libjass", [bowerPath + "/libjass/libjass.min", "css!" + bowerPath + "/libjass/libjass"], returnFirstDependency);
define("imageLoader", [embyWebComponentsBowerPath + "/images/imagehelper"], returnFirstDependency);
define("syncJobList", ["components/syncjoblist/syncjoblist"], returnFirstDependency);
define("appfooter", ["components/appfooter/appfooter"], returnFirstDependency);
define("dockedtabs", ["components/dockedtabs/dockedtabs"], returnFirstDependency);

View file

@ -98,6 +98,8 @@
var container = view.querySelector('#resumableItems');
var cardLayout = appHost.preferVisualCards;
cardBuilder.buildCards(result.Items, {
itemsContainer: container,
preferThumb: true,
@ -106,10 +108,10 @@
showTitle: true,
showParentTitle: true,
overlayText: false,
centerText: false,
centerText: !cardLayout,
overlayPlayButton: true,
allowBottomPadding: allowBottomPadding,
cardLayout: true
cardLayout: cardLayout
});
});
}

View file

@ -44,19 +44,15 @@
var elem = context.querySelector('#items');
var supportsImageAnalysis = appHost.supports('imageanalysis');
cardBuilder.buildCards(result.Items, {
itemsContainer: elem,
shape: "backdrop",
preferThumb: true,
showTitle: supportsImageAnalysis,
showTitle: false,
scalable: true,
showItemCounts: true,
centerText: !supportsImageAnalysis,
overlayMoreButton: !supportsImageAnalysis,
cardLayout: supportsImageAnalysis,
vibrant: supportsImageAnalysis
centerText: true,
overlayMoreButton: true
});
Dashboard.hideLoadingMsg();