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

Move blur of foreign element to generic dialog module

Browse source
This commit is contained in:
Dmitry Lyzo 2020-03-14 22:26:08 +03:00
parent 485ccfa116
commit 305f050003
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/dialogHelper/dialogHelper.js
View file

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

5
src/components/slideshow/slideshow.js
View file

@ -188,11 +188,6 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
stopInterval(); stopInterval();
}); });
// Blur foreign element to prevent starting of "nested" slideshow
if (document.activeElement && !dlg.contains(document.activeElement)) {
document.activeElement.blur();
}
inputManager.on(window, onInputCommand); inputManager.on(window, onInputCommand);
document.addEventListener((window.PointerEvent ? 'pointermove' : 'mousemove'), onPointerMove); document.addEventListener((window.PointerEvent ? 'pointermove' : 'mousemove'), onPointerMove);