tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

loader.js: Also preserve scroll position of `display:flex` containers

This commit is contained in:
Johannes Meyer 2019-12-11 15:26:19 +01:00
parent 680467a1aa
commit d6677bfb66
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/js/icinga/loader.js
View File

@ -1058,9 +1058,16 @@
activeElementPath = this.icinga.utils.getCSSPath($activeElement); activeElementPath = this.icinga.utils.getCSSPath($activeElement);
} }
var scrollTarget = $container;
if (! forceFocus && typeof containerId !== 'undefined') { if (! forceFocus && typeof containerId !== 'undefined') {
if (autorefresh || autoSubmit) { if (autorefresh || autoSubmit) {
scrollPos = $container.scrollTop(); if ($container.css('display') === 'flex') {
var $scrollableContent = $container.children('.content');
scrollPos = $scrollableContent.scrollTop();
scrollTarget = _this.icinga.utils.getCSSPath($scrollableContent);
} else {
scrollPos = $container.scrollTop();
}
} else { } else {
scrollPos = 0; scrollPos = 0;
} }
@ -1142,12 +1149,13 @@
} }
if (scrollPos !== false) { if (scrollPos !== false) {
$container.scrollTop(scrollPos); var $scrollTarget = $(scrollTarget);
$scrollTarget.scrollTop(scrollPos);
// Fallback for browsers without support for focus({preventScroll: true}) // Fallback for browsers without support for focus({preventScroll: true})
setTimeout(function () { setTimeout(function () {
if ($container.scrollTop() !== scrollPos) { if ($scrollTarget.scrollTop() !== scrollPos) {
$container.scrollTop(scrollPos); $scrollTarget.scrollTop(scrollPos);
} }
}, 0); }, 0);
} }