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

Restore focusPreventScroll

Browse source
This commit is contained in:
MrTimscampi 2020-08-22 19:10:08 +02:00
parent 73ab5827be
commit e88f29ac37
6 changed files with 51 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -62,7 +62,6 @@
"epubjs": "^0.3.85",
"fast-text-encoding": "^1.0.3",
"flv.js": "^1.5.0",
"focus-options-polyfill": "^1.5.0",
"headroom.js": "^0.11.0",
"hls.js": "^0.14.8",
"howler": "^2.2.0",

5
src/bundle.js
View file

@ -10,11 +10,6 @@ _define('fetch', function() {
return fetch;
});
var focusPreventScroll = require('focus-options-polyfill');
_define('focus-options-polyfill', function() {
return focusPreventScroll;
});
// Blurhash
const blurhash = require('blurhash');
_define('blurhash', function() {

10
src/elements/emby-scroller/emby-scroller.js
View file

@ -17,12 +17,10 @@ import 'css!./emby-scroller';
function initCenterFocus(elem, scrollerInstance) {
dom.addEventListener(elem, 'focus', function (e) {
setTimeout(function() {
const focused = focusManager.focusableParent(e.target);
if (focused) {
scrollerInstance.toCenter(focused);
}
}, 0);
const focused = focusManager.focusableParent(e.target);
if (focused) {
scrollerInstance.toCenter(focused);
}
}, {
capture: true,
passive: true

42
src/legacy/focusPreventScroll.js Normal file
View file

@ -0,0 +1,42 @@
// Polyfill to add support for preventScroll by focus function
if (HTMLElement.prototype.nativeFocus === undefined) {
(function () {
var supportsPreventScrollOption = false;
try {
var focusElem = document.createElement('div');
focusElem.addEventListener('focus', function(event) {
event.preventDefault();
event.stopPropagation();
}, true);
var opts = Object.defineProperty({}, 'preventScroll', {
// eslint-disable-next-line getter-return
get: function () {
supportsPreventScrollOption = true;
}
});
focusElem.focus(opts);
} catch (e) {
console.error('error checking preventScroll support');
}
if (!supportsPreventScrollOption) {
HTMLElement.prototype.nativeFocus = HTMLElement.prototype.focus;
HTMLElement.prototype.focus = function(options) {
var scrollX = window.scrollX;
var scrollY = window.scrollY;
this.nativeFocus();
// Restore window scroll if preventScroll
if (options && options.preventScroll) {
window.scroll(scrollX, scrollY);
}
};
}
})();
}

8
src/scripts/site.js
View file

@ -221,6 +221,7 @@ function initClient() {
keyboardnavigation.enable();
});
require(['mouseManager']);
require(['focusPreventScroll']);
require(['autoFocuser'], function(autoFocuser) {
autoFocuser.enable();
});
@ -462,6 +463,7 @@ function initClient() {
datetime: 'scripts/datetime',
globalize: 'scripts/globalize',
dfnshelper: 'scripts/dfnshelper',
libraryMenu: 'scripts/libraryMenu',
playlisteditor: componentsPath + '/playlisteditor/playlisteditor',
medialibrarycreator: componentsPath + '/mediaLibraryCreator/mediaLibraryCreator',
@ -520,8 +522,7 @@ function initClient() {
'events',
'credentialprovider',
'connectionManagerFactory',
'appStorage',
'focus-options-polyfill'
'appStorage'
]
},
urlArgs: urlArgs,
@ -530,7 +531,7 @@ function initClient() {
});
promise = require(['fetch'])
.then(() => require(['jQuery', 'polyfill', 'fast-text-encoding', 'intersection-observer', 'classlist-polyfill', 'focus-options-polyfill', 'css!assets/css/site', 'jellyfin-noto'], (jQuery) => {
.then(() => require(['jQuery', 'polyfill', 'fast-text-encoding', 'intersection-observer', 'classlist-polyfill', 'css!assets/css/site', 'jellyfin-noto'], (jQuery) => {
// Expose jQuery globally
window.$ = jQuery;
window.jQuery = jQuery;
@ -650,6 +651,7 @@ function initClient() {
return viewManager;
});
define('slideshow', [componentsPath + '/slideshow/slideshow'], returnFirstDependency);
define('focusPreventScroll', ['legacy/focusPreventScroll'], returnFirstDependency);
define('userdataButtons', [componentsPath + '/userdatabuttons/userdatabuttons'], returnFirstDependency);
define('listView', [componentsPath + '/listview/listview'], returnFirstDependency);
define('indicators', [componentsPath + '/indicators/indicators'], returnFirstDependency);

5
yarn.lock
View file

@ -4598,11 +4598,6 @@ flv.js@^1.5.0:
es6-promise "^4.2.5"
webworkify "^1.5.0"
focus-options-polyfill@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/focus-options-polyfill/-/focus-options-polyfill-1.5.0.tgz#fd2e6a0d6d8f828346726a5adf02f3d2bdfece5f"
integrity sha512-HiMSaXGUz2OFjOuoGTWXlp+YjZCGnVXPu6vPeccgaSOzGmqLVz8tJRcKXWfMJnj16LXf/IM1rJI0zrZMVc9q7g==
follow-redirects@1.5.10:
version "1.5.10"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"