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

update vaapi defaults

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-24 16:14:35 -04:00
parent cbca3a20ae
commit ee908c0726
6 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View file

@ -702,7 +702,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
return html;
}
function getCardFooterText(item, options, showTitle, forceName, imgUrl, footerClass, progressHtml, isOuterFooter) {
function getCardFooterText(item, options, showTitle, forceName, overlayText, imgUrl, footerClass, progressHtml, isOuterFooter) {
var html = '';
@ -737,7 +737,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
}
}
if (showTitle) {
if (showTitle || forceName) {
var name = options.showTitle == 'auto' && !item.IsFolder && item.MediaType == 'Photo' ? '' : itemHelper.getDisplayName(item);
@ -869,7 +869,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
}
}
if (showTitle && forceName && lines.length == 1) {
if (showTitle && forceName && overlayText && lines.length == 1) {
lines = [];
}
@ -1022,7 +1022,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
var overlayText = options.overlayText;
if (forceName && !options.cardLayout) {
showTitle = imgUrl;
if (overlayText == null) {
overlayText = true;
@ -1061,7 +1060,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
if (overlayText) {
footerCssClass = progressHtml ? 'innerCardFooter fullInnerCardFooter' : 'innerCardFooter';
innerCardFooter += getCardFooterText(item, options, showTitle, forceName, imgUrl, footerCssClass, progressHtml, false);
innerCardFooter += getCardFooterText(item, options, showTitle, forceName, overlayText, imgUrl, footerCssClass, progressHtml, false);
footerOverlayed = true;
}
else if (progressHtml) {
@ -1080,7 +1079,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
var outerCardFooter = '';
if (!overlayText && !footerOverlayed) {
footerCssClass = options.cardLayout ? 'cardFooter visualCardBox-cardFooter' : 'cardFooter transparent';
outerCardFooter = getCardFooterText(item, options, showTitle, forceName, imgUrl, footerCssClass, progressHtml, true);
outerCardFooter = getCardFooterText(item, options, showTitle, forceName, overlayText, imgUrl, footerCssClass, progressHtml, true);
}
if (outerCardFooter && !options.cardLayout && options.allowBottomPadding !== false) {

13
dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.js vendored
View file

@ -154,6 +154,13 @@
return html;
}
function onCardOverlayButtonsClick(e) {
var button = dom.parentWithTag(e.target, 'BUTTON');
if (button) {
e.stopPropagation();
}
}
function onShowTimerExpired(elem) {
@ -164,6 +171,10 @@
innerElem.classList.add('hide');
innerElem.classList.add('cardOverlayTarget');
// allow the overlay to be clicked to view the item
innerElem.classList.add('itemAction');
innerElem.setAttribute('data-action', 'link');
var appendTo = elem.querySelector('div.cardContent') || elem.querySelector('.cardScalable') || elem.querySelector('.cardBox');
//if (appendTo && appendTo.tagName == 'BUTTON') {
@ -203,6 +214,8 @@
var user = responses[1];
innerElem.innerHTML = getOverlayHtml(apiClient, item, user, dataElement);
innerElem.querySelector('.cardOverlayButtons').addEventListener('click', onCardOverlayButtonsClick);
});
slideUpToShow(innerElem);

3
dashboard-ui/encodingsettings.html
View file

@ -16,7 +16,8 @@
<div class="fieldDescription">${LabelHardwareAccelerationTypeHelp}</div>
</div>
<div class="inputContainer hide fldVaapiDevice">
<input is="emby-input" type="text" id="txtVaapiDevice" label="${LabelVaapiDevice}" />
<input is="emby-input" type="text" id="txtVaapiDevice" label="${LabelVaapiDevice}"/>
<div class="fieldDescription">${LabelVaapiDeviceHelp}</div>
</div>
<div class="selectContainer">
<select is="emby-select" id="selectThreadCount" label="${LabelTranscodingThreadCount}">

14
dashboard-ui/scripts/itemlistpage.js
View file

@ -112,15 +112,7 @@
coverImage: item.Type == 'PhotoAlbum'
};
if (viewStyle == "Backdrop") {
posterOptions.shape = 'backdrop';
posterOptions.showTitle = true;
posterOptions.preferBackdrop = true;
html = cardBuilder.getCardsHtml(posterOptions);
}
else if (viewStyle == "PosterCard") {
if (viewStyle == "PosterCard") {
posterOptions.showTitle = true;
posterOptions.showYear = true;
@ -137,9 +129,11 @@
});
}
else if (viewStyle == "Thumb") {
posterOptions.preferThumb = true;
posterOptions.showTitle = true;
posterOptions.shape = "backdrop";
posterOptions.centerText = true;
posterOptions.overlayText = false;
html = cardBuilder.getCardsHtml(posterOptions);
} else {

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

@ -1954,6 +1954,7 @@ var AppInfo = {};
dependencies: ['emby-button', 'emby-input'],
autoFocus: false,
anonymous: true,
startup: true,
controller: 'scripts/connectlogin'
});
@ -2053,6 +2054,7 @@ var AppInfo = {};
path: '/forgotpassword.html',
dependencies: ['emby-input', 'emby-button'],
anonymous: true,
startup: true,
controller: 'scripts/forgotpassword'
});
@ -2061,6 +2063,7 @@ var AppInfo = {};
dependencies: ['emby-input', 'emby-button'],
autoFocus: false,
anonymous: true,
startup: true,
controller: 'scripts/forgotpasswordpin'
});
@ -2242,6 +2245,7 @@ var AppInfo = {};
dependencies: ['emby-button', 'humanedate', 'emby-input'],
autoFocus: false,
anonymous: true,
startup: true,
controller: 'scripts/loginpage'
});
@ -2471,6 +2475,7 @@ var AppInfo = {};
dependencies: ['listViewStyle', 'emby-button'],
autoFocus: false,
anonymous: true,
startup: true,
controller: 'scripts/selectserver'
});

3
dashboard-ui/strings/en-US.json
View file

@ -2323,5 +2323,6 @@
"HeaderOfflineSync": "Offline Sync",
"LabelMaxAudioFileBitrate": "Max audio file bitrate:",
"LabelMaxAudioFileBitrateHelp": "Audio files with a higher bitrate will be converted by Emby Server. Select a higher value for better quality, or a lower value to conserve local storage space.",
"LabelVaapiDevice": "VA API Device:"
"LabelVaapiDevice": "VA API Device:",
"LabelVaapiDeviceHelp": "This is the render node that is used for hardware acceleration."
}