mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge pull request #819 from dmitrylyzo/fix_scrollmanager
Disable scrollManager on emby-scroller in "native mode"
This commit is contained in:
commit
a68b0baa74
1 changed files with 13 additions and 2 deletions
|
@ -158,11 +158,22 @@ define(["dom", "browser", "layoutManager"], function (dom, browser, layoutManage
|
||||||
*/
|
*/
|
||||||
function getScrollableParent(element, vertical) {
|
function getScrollableParent(element, vertical) {
|
||||||
if (element) {
|
if (element) {
|
||||||
|
var nameScroll = "scrollWidth";
|
||||||
|
var nameClient = "clientWidth";
|
||||||
|
var nameClass = "scrollX";
|
||||||
|
|
||||||
|
if (vertical) {
|
||||||
|
nameScroll = "scrollHeight";
|
||||||
|
nameClient = "clientHeight";
|
||||||
|
nameClass = "scrollY";
|
||||||
|
}
|
||||||
|
|
||||||
var parent = element.parentElement;
|
var parent = element.parentElement;
|
||||||
|
|
||||||
while (parent) {
|
while (parent) {
|
||||||
if ((!vertical && parent.scrollWidth > parent.clientWidth && parent.classList.contains("scrollX")) ||
|
// Skip 'emby-scroller' because it scrolls by itself
|
||||||
(vertical && parent.scrollHeight > parent.clientHeight && parent.classList.contains("scrollY"))) {
|
if (!parent.classList.contains("emby-scroller") &&
|
||||||
|
parent[nameScroll] > parent[nameClient] && parent.classList.contains(nameClass)) {
|
||||||
return parent;
|
return parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue