diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index 4d954e4842..d91c37a1bd 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -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) { diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.js b/dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.js index b9abbc7e38..e17182f837 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.js +++ b/dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.js @@ -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); diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html index e334fda4ec..cdd1de49b0 100644 --- a/dashboard-ui/encodingsettings.html +++ b/dashboard-ui/encodingsettings.html @@ -16,7 +16,8 @@