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

Merge pull request #1 from jellyfin/master

Up-to-date
This commit is contained in:
Ulrich Wagner 2020-02-19 07:48:36 +01:00 committed by GitHub
commit e7b4a80941
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 76 additions and 24 deletions

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;
}