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

Merge remote-tracking branch 'upstream/master' into perfect_slider-2

Browse source
This commit is contained in:
Dmitry Lyzo 2020-02-19 11:11:32 +03:00
commit bafac46a33
26 changed files with 165 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/cardbuilder/card.css
View file

@ -370,8 +370,8 @@ button::-moz-focus-inner {
text-align: center;
}
.cardImageIcon {
font-size: 5em !important;
.cardImageContainer .cardImageIcon {
font-size: 5em;
color: inherit;
}

4
src/components/cardbuilder/cardBuilder.js
View file

@ -1500,6 +1500,10 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
return '<i class="cardImageIcon material-icons">movie</i>'
case 'Series':
return '<i class="cardImageIcon material-icons">tv</i>'
case 'Book':
return '<i class="cardImageIcon material-icons">book</i>'
case 'Folder':
return '<i class="cardImageIcon material-icons">folder</i>'
}
if (options && options.defaultCardImageIcon) {

5
src/components/indicators/indicators.js
View file

@ -152,9 +152,12 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
if (item.Type === 'Video') {
return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon">videocam</i></div>';
}
if (item.Type === 'Folder' || item.Type === 'PhotoAlbum') {
if (item.Type === 'Folder') {
return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon">folder</i></div>';
}
if (item.Type === 'PhotoAlbum') {
return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon photo_album"></i></div>';
}
if (item.Type === 'Photo') {
return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon">photo</i></div>';
}

15
src/components/scrollManager.js
View file

@ -158,11 +158,22 @@ define(["dom", "browser", "layoutManager"], function (dom, browser, layoutManage
*/
function getScrollableParent(element, vertical) {
if (element) {
var nameScroll = "scrollWidth";
var nameClient = "clientWidth";
var nameClass = "scrollX";
if (vertical) {
nameScroll = "scrollHeight";
nameClient = "clientHeight";
nameClass = "scrollY";
}
var parent = element.parentElement;
while (parent) {
if ((!vertical && parent.scrollWidth > parent.clientWidth && parent.classList.contains("scrollX")) ||
(vertical && parent.scrollHeight > parent.clientHeight && parent.classList.contains("scrollY"))) {
// Skip 'emby-scroller' because it scrolls by itself
if (!parent.classList.contains("emby-scroller") &&
parent[nameScroll] > parent[nameClient] && parent.classList.contains(nameClass)) {
return parent;
}