mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge pull request #1903 from dmitrylyzo/return-of-the-scrollbar
Return permanent scrollbar
This commit is contained in:
commit
f3d1b77058
10 changed files with 49 additions and 31 deletions
|
@ -12,7 +12,6 @@
|
|||
.alphaPicker-fixed {
|
||||
position: fixed;
|
||||
bottom: 5.5em;
|
||||
z-index: 999999;
|
||||
}
|
||||
|
||||
.alphaPickerRow {
|
||||
|
|
|
@ -310,10 +310,6 @@ import '../../assets/css/scrollstyles.css';
|
|||
const supportsOverscrollBehavior = 'overscroll-behavior-y' in document.body.style;
|
||||
|
||||
function shouldLockDocumentScroll(options) {
|
||||
if (supportsOverscrollBehavior && (options.size || !browser.touch)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (options.lockScroll != null) {
|
||||
return options.lockScroll;
|
||||
}
|
||||
|
@ -322,6 +318,10 @@ import '../../assets/css/scrollstyles.css';
|
|||
return true;
|
||||
}
|
||||
|
||||
if (supportsOverscrollBehavior && (options.size || !browser.touch)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (options.size) {
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -559,9 +559,6 @@ export default function (options) {
|
|||
inputManager.off(window, onInputCommand);
|
||||
/* eslint-disable-next-line compat/compat */
|
||||
document.removeEventListener((window.PointerEvent ? 'pointermove' : 'mousemove'), onPointerMove);
|
||||
// Shows page scrollbar
|
||||
document.body.classList.remove('hide-scroll');
|
||||
document.body.classList.add('force-scroll');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -761,9 +758,6 @@ export default function (options) {
|
|||
*/
|
||||
self.show = function () {
|
||||
createElements(options);
|
||||
// Hides page scrollbar
|
||||
document.body.classList.remove('force-scroll');
|
||||
document.body.classList.add('hide-scroll');
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue