From 07268df35a9ad683352b15a6b0b675257ebec295 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sun, 16 Feb 2020 22:06:37 +0300 Subject: [PATCH 1/2] Simplify expression --- src/components/scrollManager.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/scrollManager.js b/src/components/scrollManager.js index 57107ed185..ba000ed954 100644 --- a/src/components/scrollManager.js +++ b/src/components/scrollManager.js @@ -158,11 +158,20 @@ 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"))) { + if (parent[nameScroll] > parent[nameClient] && parent.classList.contains(nameClass)) { return parent; } From 6ad85b3c45020a78ac105b2db72d81d8d969d48e Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sun, 16 Feb 2020 22:08:08 +0300 Subject: [PATCH 2/2] Disable scrollManager on emby-scroller --- src/components/scrollManager.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/scrollManager.js b/src/components/scrollManager.js index ba000ed954..4ba696d744 100644 --- a/src/components/scrollManager.js +++ b/src/components/scrollManager.js @@ -171,7 +171,9 @@ define(["dom", "browser", "layoutManager"], function (dom, browser, layoutManage var parent = element.parentElement; while (parent) { - if (parent[nameScroll] > parent[nameClient] && parent.classList.contains(nameClass)) { + // Skip 'emby-scroller' because it scrolls by itself + if (!parent.classList.contains("emby-scroller") && + parent[nameScroll] > parent[nameClient] && parent.classList.contains(nameClass)) { return parent; }