jellyfin/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-12-12 00:06:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #920 from dmitrylyzo/fix_slideshow-2

Browse Source 
Fix slideshow 2
This commit is contained in:
dkanada 2020-03-15 18:47:06 +09:00 committed by GitHub
commit 95f379021e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/dialogHelper/dialogHelper.js
View File

@ -242,9 +242,15 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
var onAnimationFinish = function () { var onAnimationFinish = function () {
focusManager.pushScope(dlg); focusManager.pushScope(dlg);
if (dlg.getAttribute('data-autofocus') === 'true') { if (dlg.getAttribute('data-autofocus') === 'true') {
focusManager.autoFocus(dlg); focusManager.autoFocus(dlg);
} }
if (document.activeElement && !dlg.contains(document.activeElement)) {
// Blur foreign element to prevent triggering of an action from the previous scope
document.activeElement.blur();
}
}; };
if (enableAnimation()) { if (enableAnimation()) {

10
src/scripts/inputManager.js
View File

@ -58,7 +58,15 @@ define(['playbackManager', 'focusManager', 'appRouter', 'dom', 'apphost'], funct
sourceElement = focusManager.focusableParent(sourceElement); sourceElement = focusManager.focusableParent(sourceElement);
} }
sourceElement = sourceElement || document.activeElement || window; if (!sourceElement) {
sourceElement = document.activeElement || window;
var dlg = document.querySelector('.dialogContainer .dialog.opened');
if (dlg && (!sourceElement || !dlg.contains(sourceElement))) {
sourceElement = dlg;
}
}
if (eventListenerCount) { if (eventListenerCount) {
var customEvent = new CustomEvent("command", { var customEvent = new CustomEvent("command", {